old seed data
Merge remote-tracking branch 'upstream/master' into readme

Conflicts:
	db/seeds.rb
WIP: Add dragonfly dropbox datastore
WIP adds dropbox photo uploaders
Devise user signup
Required tables are not attacing
Merge remote-tracking branch 'upstream/master' into devise
Adds ability to upload to remote server
updated devise folder
Merged conflicts
merged conflicts
pulling upstream master
fixed conflicts uploads branch
adding login route/view and setting up images
merged upstream master
changed sign up form title
merging upstream master -- fix font-awesome
fixes to styles