working on recording data...
Merge branch 'master' into ports
working on data recording...
Merge branch 'master' into ports

Conflicts:
	js/floss.js
minor
Merge branch 'master' into ports
record scripts...
added error.php
debugging
adding training pages...
minor
writing training pages...
working on training pages...
working...
working...
debugged problem with BP drag
working...
Debugged the problem we saw with the final training
exercise graph.
minor
Merge branch 'master' into ports