merge conflic test
Merge branch 'master' of github.com:lawrhuan/Bucharest

Conflicts:
	res/layout/activity_main.xml