updated lots of shit
navbar merge fix
Merge branch 'master' of https://github.com/THEtheChad/wishwizard
a whole bunch more shit
Merge branch 'master' of https://github.com/THEtheChad/wishwizard