messing with layout
Merge branch 'master' of https://github.com/Fofofosho/mustached

Conflicts:
	res/layout/main.xml