merge
Merge branch 'master' of https://github.com/epha/akte

Conflicts:
	code/akte.js