Merge branch 'master' of https://github.com/edlongman/whileaway into ots-validation
ots.php now sums videos and some other stuff.
I hate txt.txt
Merge commit 'c82381aa56251a8e39f90260c278533b951b2d59' into ots

Conflicts:
	site/txt.txt
bug fixes
commiting
Merge commit '20ee622830e855b5e88e68ace1e6156cc0afdbed' into ots

Conflicts:
	site/txt.txt
Merge branch 'master' into ots