.
Merge branch 'master' of https://github.com/jakupllarif/Senior-Project

Conflicts:
	SeniorProject/SeniorProject.userprefs
	SeniorProject/SeniorProject/bin/iPhoneSimulator/Debug/SeniorProject.exe

SeniorProject/SeniorProject/bin/iPhoneSimulator/Debug/SeniorProject.exe.
mdb
	SeniorProject/SeniorProject/bin/iPhoneSimulator/Debug/err.log