Post-crash
Merge remote-tracking branch 'origin/master'

Conflicts:
	add.py
	tweet.py
	www/about.txt
	www/index.php
	www/scripts/scripts.js
	www/start.php
	www/styles/stylesheet.css

Merge crash and main branches