Forgot to delete old code
Test Framework, results, repo browser
Merge branch 's3-rubrics' of https://github.com/arkon/Markus into style-guide
Merge branch 's3-missing' of https://github.com/arkon/Markus into style-guide

Conflicts:
	app/views/automated_tests/_form.html.erb
SyntaxHighlighter variables/imports
Merge branch 's3-missing' of https://github.com/arkon/Markus into style-guide