colour button yay

you know
Merge branch 'master' of https://github.com/samcorcoran/CompetitiveColours

Conflicts:

	CompetitiveColours/app/src/main/java/uk/wycor/competitivecolours/app/MainActivity.java