mainactivity
Merge branch 'master' of git@github.com:StevenKo/Restarurant.git

Conflicts:
	.classpath
fix error