pulling
Merge branch 'master' of https://github.com/Cthulu93/CS121-2014

Conflicts:
	Glossalalia/Glossalalia.xcodeproj/project.pbxproj