Creating template
Merge branch 'express/master'

Conflicts:
	README.md
Revert "Merge branch 'express/master'"

This reverts commit db758935620edc995fc825467aaf29f9bbe53347, reversing
changes made to b9dc2d03e03fe3d98dbd7ef1bffa831a9c9974df.