fixed odd menu bugs
minor tweaks and fixes
Merge branch 'master' of https://github.com/bsanders/softeng
most notably, began implementation of greyscale
Merge branch 'master' of https://github.com/bsanders/softeng
pre-pull commit