Now tracking test status
Factored out default settings for CSS/HTML/JS
Merge remote-tracking branch 'sarah-testFramework/master'
merging