Working on Qunit tests
Fix Conflicts
Merge remote-tracking branch 'upstream/master'
Professor updates and some testing
Merge remote-tracking branch 'upstream/master'
Merge pull request #24 from ssj3sunny/master

Fix Javscript / tests