Minor Changes
Merge branch 'master' of https://github.com/totoromano/Agon

Conflicts:
	Agon.xcodeproj/project.pbxproj
Minor changes