Merge branch 'dev'

Conflicts:
	README.md
	_zanpan/chat/befunge.html
	simple/js/input_buffer.js