preliminary testing of git
Removed colour map
Merge https://github.com/kaisakajala/quotes into old-state
Added a KK quote
Merge branch 'master' into kkdev
quote
modified quote
Fix kaisakajala-master merge conflict
Merge branch 'kaisakajala-master'