Merge branch 'master' of github.com:f00f/training

Conflicts:
	training/inc/lib.inc.php
Merge branch 'master' of github.com:f00f/training
Updated images (thumbnails).
Removed branding.
Merged header into index.shtml. Moved inline css and js into own files.