jordan's stuff for FlufferBuffer
merged stuff
Merge branch 'master' of https://github.com/ArrenYu/LD29

Conflicts:
	index.html
	js/FlufferBuffer.js
	js/main.js
Merge branch 'master' of https://github.com/ArrenYu/LD29