a lot of stuff....
Merge branch 'view' of https://github.com/anst/sohacks into view

Conflicts:
	index.php
	views/head.html