first files
Merge branch 'master' of https://github.com/samthomson/colourage

merging to make a first commit from different machine