upgrade to express 4
fix merge conflicts
Merge pull request #1 from kitchencheck/improvement/upgrade-express

Improvement/upgrade express