added static dir to gitignore
Merge branch 'master' of github.com:micahhausler/haff-website
Merge branch 'master' of github.com:micahhausler/haff-website
added heroku db settings