Commit

Commit
Merge branch 'master' of https://github.com/bobbyloo92/INFO-4290-Friend-Quiz

Conflicts:
	Friend Quiz.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/bobbyloo92/INFO-4290-Friend-Quiz