ImageMap & Cleaned up menu functions
Merge branch 'master' of https://github.com/AaronMorton/Sorry_SoftwareEngineering