Testing conflicting changes.
Merge branch 'master' of https://github.com/geoffowens/GAPT

Conflicts:
	GitAndPodsTest/GPTAppDelegate.m

Merging to resolve conflicts.