pre1
modify1
no responsive
Merge branch 'master' of https://github.com/beslow/small_pc_demo_temp

Conflicts:
	jiaren
	jiaren.pub
Merge branch 'master' of https://github.com/beslow/small_pc_demo_temp