yayyyyyyyyyyyy
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$GetMapThread.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain.class
	App/bin/resources.ap_