bootstrap2换到bootstrap3.2
Merge branch 'master' of https://github.com/qiangyin/nodejsdemo

Conflicts:
	ReadMe.txt