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
fixed json parse bug
whileaway.js -> main.js
Performance and html structure
Tidied up everything
fixed rss_log.py
Merge branch 'master' of github.com:edlongman/muzzle
fixed another index out of range bug: soory for working on master
Layout changes
Merge branch 'master' of https://github.com/edlongman/thescoop
commiting
main.js
Merge commit '20ee622830e855b5e88e68ace1e6156cc0afdbed' into ots

Conflicts:
	site/txt.txt
Stuff
Merge branch 'master' into ots
Merge branch 'master' of https://github.com/edlongman/thescoop