Colours c c c colours
Merge branch 'master' of https://github.com/MattBessey/ballin-octo-hipster

Conflicts:
	src/com/boh/flatmate/ShoppingRowAdapter.java