untested configurable time penalty && unworking additional error types
merge
implimented short name functionality for problems
edits
Merge branch 'george' of https://github.com/dansan21/touche into daniel
Moved start contest over to admin. Added c and c++ jails. Bug Fixes.
initial ideas for test teams
initial ideas for test teams
message merge
Judge Styling part way done
merge with daniel
Added confirm participants functionality
merge
Added java jails. Bug fixes
added test start logic
added test start functionality
matt 3 features tested
asdf
matt 3 features tested
Merge branch 'daniel' of http://github.com/dansan21/touche

Conflicts:
	master-crontab.cron
	public_html/develop/admin/test.php