init
Merge branch 'master' of https://github.com/SunnyKim925/Whateat

Conflicts:
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/values/strings.xml