Merge branch 'master' of https://github.com/JMarple/HackBean2014

Conflicts:
	index.php
Test HTML
Test
test