Aaaand we have a teapot
Merge branch 'master' of ssh://github.com/ginacollecchia/GuitarFace

Conflicts:
	GuitarFace.xcodeproj/project.pbxproj
Fixed broken pbxproj