deleted extra pg gem, got rid of sql, added schema back in
Merge pull request #17 from MarcGarreau/data_changes

deleted extra pg gem, got rid of sql, added schema back in
Adds Instagram Omniauth
final-ish welcome view
Merge pull request #18 from MarcGarreau/finish-root-wirefram

final-ish welcome view
Merge branch 'master' of https://github.com/MarcGarreau/footprints into omniauth
Tests OmniAuth; Mind blown: OA doesn't touch user controller
Update README.rdoc
Merge pull request #23 from MarcGarreau/omniauth

Omniauth
Adds image, nickname and name to user
Corrects tests for new user fields
built trip model,
spec for validating trip and date formatting
Merge pull request #28 from MarcGarreau/update_user_model

Update user model
model updates
fixes Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/user.rb
	db/structure.sql