changed colors to buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	StaTapAlpha/res/layout/activity_court.xml
Merge branch 'master' of https://github.com/OlatheSouthCaSE/StaTap
Merge branch 'master' of https://github.com/OlatheSouthCaSE/StaTap