Merge remote-tracking branch 'origin/facebook_album' into jasmine
Merge remote-tracking branch 'origin/editing_photo_attributes' into jasmine
add jasmine tests
use more efficient loop
add jasmine tests
add vertCenter and test
add trips_controller_specs
add trips controller specs
use bundle exec with rake jasmine:ci
add capybara
add trips controller specs, configure travis
add trips controller specs
correct test
resolve conflict
Merge branch 'master' into rspec
Merge pull request #20 from th7/rspec

Rspec