added PROCfile
Merge branch 'master' of heroku.com:pollingapptestjosh
fixed settings
fixed gitignore
Merge branch 'master' of heroku.com:pollingapptestjosh