Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements ...

Conflicts:
	views/coursewares/showJS.jade

2015-03-28 00:24:41 -07:00

..

bonfireFramework_v0.1.2.js

start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds

2015-03-27 14:36:17 -07:00

bonfireInit.js

Refactor error message from bonfire

2015-03-01 09:54:03 +09:00

plugin_v0.1.4.js

Close web worker after completion

2015-03-22 16:57:10 -07:00