update
update
Merge branch 'master' of github.com:lemonlwz/bike

Conflicts:
	assets/style/bike.css
	assets/style/sass/mods/_person-center.scss