update
Merge branch 'master' of https://github.com/chimney1025/chimney1025.github.io

Conflicts:
	app/views/user-detail.html