Merge pull request #1 from femmestem/chore/build_test

Chore/build test
Merge pull request #2 from femmestem/bug/Travis_gemfile_conflict

Bug/travis gemfile conflict
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Gemfile.lock merge conflict
Gemfile.lock merge conflict
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Added db/schema.rb and README.rdoc
Deleted Gemfile.lock and README.rdoc
Merge pull request #1 from nealfennimore/chore/gitignore_new

Chore/ignore_gemlock
Removed belongs_to from photos and posts model
Merge pull request #12 from nealfennimore/chores/remove-belongs-to-from-models

Chores/remove_duplicate_associations_between_trips_and_post/photo_models
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Remove auto-generated schema
Resolve gem conflict per Travis test

Remove duplicate 'pry' gem in production, belongs in test/dev only
Merge pull request #13 from spring-peepers-2014/bug/Travis_gemfile_conflict

Bug/travis gemfile conflict