added feature tests to be implemented
added model association tests to be implemented
added controller skeletons
fixed merge conflicts in controllers
added rspec gem to Gemfile