changed main page
Merge branch 'master' of github.com:CMPUT301W14T11/Team11Prototype

Conflicts:
	libproject/google-play-services_lib/bin/google-play-services_lib.jar
changed main page