Mar 7 Hail Mary commmit
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project

Conflicts:
	Team7Project/src/ca/ualberta/team7project/MainActivity.java