Added colour buttons
Merge branch 'master' of https://github.com/MattBessey/ballin-octo-hipster

Conflicts:
	res/values/styles.xml
Merge branch 'master' of https://github.com/MattBessey/ballin-octo-hipster