reverting
Merge branch 'master' of github.com:clammy77/movies
fixed a lot of stuff