Chaning aesthetics
Merge branch 'master' of https://github.com/jburgener/Quarto

Conflicts:
	res/layout/activity_main.xml