pulled navbar stuff right
Merge branch 'master' of https://github.com/gears88/YRS2013