made navbar work
changed stuff
Merge branch 'master' of https://github.com/taylorniki/RollergirlsInPagosa