swing test
Merge branch 'master' of https://github.com/joshricha/project_2
navbar added
navbar update