added clean task
added DB config, so that we can run the DB on Heroku
merged data.sql
Merge remote-tracking branch 'origin/master'