Merge branch 'master' of https://github.com/madrobby/microjs.com into tinyOSF

Conflicts:
	data.js
make