bootstrap
Merge branch 'master' of github.com:haseYu/node-sample

Conflicts:
	views/index.jade