Merge branch 'master' into devon-milestone-4B
Merge branch 'master' into devon-milestone-4B
THE JAVASCRIPT TESTS LIVE AGAIN! *Gargoyles theme starts playing*
Merge branch 'master' into devon-milestone-4B
merge successful, fixed some formatting
Merge pull request #66 from CombustibleLemons/devon-milestone-4B

JS Tests Work Again