local project settings
merged proj file
local proj changes
Merge branch 'master' of github.com:banane/thinknote
color updates