Colours
Merge branch 'master' of github.com:dunz0r/Sakletaren