Merge pull request #41 from tbuchanan/master

fixed nav links
Merge pull request #42 from tbuchanan/master

precompiled
Merge pull request #43 from tbuchanan/master

minor change to popups controller
Merge branch 'master' of https://github.com/mathur7/Project-2
precompiled