guigui update
Merge branch 'master' of https://github.com/Makio64/christmasexperiments2

Conflicts:
	www/2013/04/src/main.js
Merge branch 'master' of https://github.com/Makio64/christmasexperiments2