Setup Game basic view
Merge branch 'master' of https://github.com/GrinnellAppDev/FaceTag-iOS

Conflicts:
	FaceTag/Base.lproj/Main_iPhone.storyboard