Refactored for Express 3.x
Merge branch 'master' of heroku.com:lezed1-french