removing unicorn b/c it breaks heroku
fixing secret key prob
add database.yml to .gitignore
Merge branch 'master' of github.com:TapWater/TapWater-Rails