fix merge conflicts
Merge branch 'master' of github.com:mattThousand/movie_viewing_app
Merge branch 'master' of github.com:mattThousand/movie_viewing_app
migrate database
create association between likes and movies

- create like_spec.rb

- create user_likes_movie_spec.rb
nest likes resource in movies
Create likes controller, implement movie liking
add load_likeable method to likes controller
implement review liking

- add likes association to review model

- nest likes resource under reviews

- create show action for review
handle for referrer being nil in likes_controller redirect
check that resource being liked is either movie or review
create likeable_types method to check for valid resource
move redirect_back_or_to_default to application_controller
Merge pull request #10 from mattThousand/like_a_movie

Like a movie