bringing in to sync
Merge branch 'master' of https://github.com/MaxMahem/CVH.git
moved NavMenu to seperate class.