Merge branch 'master' of heroku.com:hackduke-website
Merge branch 'master' of heroku.com:hackduke-website