Name change
Merge remote-tracking branch 'origin/master'

Conflicts:
	LocaLoca/app/src/main/java/com/example/group3/localoca/MainMenu.java