fixed minor bugs and fixed nav bar
Merge branch 'master' of https://github.com/timsants/CS147-Project