bug fix: capybarahelpers
create spec file to test Trip class, contains tests
Added pending photo controller test, added photo controller
Added and changed map javascript:

- Added new InfoBox.js file for easy googlemaps info boxes
- Added new click functions to:  updated marker placement with info boxes
- Added zoom listener so map does not Zoom in too much when marker/waypoint places
- Added reference to InfoBox.js to layout page
Merge pull request #42 from femmestem/chore/build_test

Add database yml for Travis to check build w pend/fail Rspec tests
Added and changed map javascript:

- Added new InfoBox.js file for easy googlemaps info boxes
- Added new click functions to:  updated marker placement with info boxes
- Added zoom listener so map does not Zoom in too much when marker/waypoint places
- Added reference to InfoBox.js to layout page
Correct typo in database adapter from Postgres to Postgresql
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Added and changed map javascript:

- Added new InfoBox.js file for easy googlemaps info boxes
- Added new click functions to:  updated marker placement with info boxes
- Added zoom listener so map does not Zoom in too much when marker/waypoint places
- Added reference to InfoBox.js to layout page
Merge branch 'features/views_map' of https://github.com/nealfennimore/TravelBlog into features/views_map
Merge branch 'features/views_map' of https://github.com/spring-peepers-2014/TravelBlog
Commented out unused event listeners
Merge pull request #43 from nealfennimore/features/views_map

Added and changed map javascript
Failing due to Travis/Rspec conflict, all other code passes build test
Update Travis CI hook to reference new database yml
Resolve merge conflict due to pull vs rebase

Conflict due to pull after branch merge
No changes, conflict in commented vs uncommented block
Update Travis CI hook
Revert "Update Travis CI hook"

This reverts commit 6102330f89c23ebab41a049149c113711501c16f.
Changed layout around:

- Sidebar now display all pages with yield
- Styling for text against black side bar
- Map on every page
Revert bad Travis hook, invalid command to create database
Added and edited factories
- Created location_pin factory
- Created map factory