navbar
fix
Merge branch 'master' of github.com:jfknox/movieMashup into jeremy
Merge branch 'master' of github.com:jfknox/movieMashup into jeremy
navbar
Removes .idea from git and puts .idea in .gitignore
merge fixed