doing lesson 4
Merge branch 'master' of github.com:littlell/myexpress

Conflicts:
	test/app_spec.js
finish lesson4