fixes #160
Merge branch 'more-javascript' of github.com:YaleSTC/shifts into more-javascript