tried the dialog thing
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project

Conflicts:
	CMPUT301T02Project/AndroidManifest.xml