onload
Merge branch 'master' of https://github.com/zchn/zchn.github.io

Conflicts:
	js/studiomaghome.js