Got kicked out of classroom -- View controllers built
Merge branch 'master' of https://github.com/JamesZinger/Axon2048

Conflicts:
	Axon2048/Axon2048.xcodeproj/project.pbxproj
Added gitignore for project files