test
test
Merge branch 'master' of https://github.com/CedricEmery/AlloGamingObjective-C

Conflicts:
	AlloGaming/AlloGaming.xcodeproj/project.pbxproj