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

Conflicts:
	AlloGaming/AlloGaming.xcodeproj/project.pbxproj
	AlloGaming/AlloGaming/Base.lproj/Main.storyboard