Added colour picker
Merge branch 'master' of github.com:artemlitch/whiteboard
Updated stuff so colour picker works