added cmake build support
fixed colour rendering
added netbeans files to gitignore
resized and recoloured screens
Merge remote-tracking branch 'upstream/master'

Merging Holly's repo with my