removed conflicting Gemfile~
Added a ton of files to start correcting the database. PRIOR was initial setup.
Fixed the database.
Merge branch 'master' into laptop
Dan
Merge pull request #1 from quiqie/laptop

Laptop