tree 89dbc316fa460b4f30d61c60ea496d230766b6ca
parent b022377fe3929c4759277797114d07f9abb97d32
parent 1500c160e2bdb65981e816180fa47fd8a42860bb
author Robert Walsh <rjwalsh1985@gmail.com> 1473894450 -0500
committer Robert Walsh <rjwalsh1985@gmail.com> 1473894450 -0500

Merge branch 'master' into swift_3.0

# Conflicts:
#	Tests/ASSET_Tests.swift
#	Tests/GET_Tests.swift