Philip C Monk 7b10fd3f47 Merge branch 'kidsort-fixed', remote-tracking branches 'wilderr/master', 'anton/talk-offline' and 'curtis/trivial' into pending ... kidsort-fixed is a fixed version of galen/kidsort. fixes #516		2015-11-04 13:46:13 -05:00
..
src	Merge branch 'kidsort-fixed', remote-tracking branches 'wilderr/master', 'anton/talk-offline' and 'curtis/trivial' into pending	2015-11-04 13:46:13 -05:00
hymn.hook	moved static html out of main.coffee	2015-10-30 15:36:30 -07:00