added color to the buttonsw
Merge remote-tracking branch 'upstream/source' into colorfulbuttons

Conflicts:
	source/stylesheets/all.css
Merge pull request #25 from jendiamond/colorfulbuttons

added color to the buttons