Nav bar
mERGE branch 'master' of github.com:StphNxn/Configurator