Prepared for heroku deployment
Merge branch 'master' of github.com:itedd/itedd