navbar
fix
Merge branch 'master' of github.com:jfknox/movieMashup into jeremy
Merge branch 'master' of github.com:jfknox/movieMashup into jeremy
schema changes and controller builds
fixes conflict
seed file started
fixed migration error
navbar
navbar
removed .idea
navbar
Merges with .gitignored .idea master branch
Removes .idea from git and puts .idea in .gitignore
Ready to pull master to fix rubymine .idea issue
merge fixed
comminted
comminted
navbar
Merge branch 'jeremy'