added UI
Merge branch 'master' of https://github.com/stervy/amico

Conflicts:
	Amico/app/src/main/res/layout/activity_main.xml