why make me do this?
Merge branch 'master' of https://github.com/tannersmith1/SeniorProject

Conflicts:
	SeniorProject.xcodeproj/project.pbxproj