Merge branch 'master' of github.com:EdgarOrtegaRamirez/movietracker into edgar

Conflicts:
.gitignore
app/models/movie.rb
app/views/movies/show.html.haml
db/schema.rb
spec/models/movie_spec.rb