css updates
Merge remote-tracking branch 'origin/13/2/14---matching-engine-updates' into 1/22/13-david
css and squiggles
css changes
css and sessions work
grading changes
waiting on grading
grading updates
grading updates
css updates
new checker move to testing
testing fixes
IT WORKS!!!!!
updates for everything
Merge remote-tracking branch 'origin/1/22/13-david' into WPM-master

Conflicts:
	Server_Files/IA/courses/UNTITLED/demo-dev1.json
	Server_Files/IA/portal.php
	Server_Files/InlineAssessment.lib.js
merged branches
finished