muahaha
Merge branch 'js-alive' of github.com:viewfuhrer/dictionary-editor into js-alive