changes to database.yml file and gems added
changes made to the poduction.rb file in config environemtns, changes made to the dtabase.yml file
merge conflicts - fized?
after bundle
data seeded in database
omniauth working except facebook, styling done in places