add weight
divide smartphone
Merge branch 'master' of https://github.com/oboenikui/oboenikui.github.io

Conflicts:
	contents.js