resized and restyled color picker button (through meticulous css editing)
Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	design/flag.png