Added a basic front-end, no javascript or media queries yet
Renames index file ready for merge to avoid conflicts (bit of a cheat I know but meh)
Merge branch 'front-end'

Conflicts:
	.gitignore
	web/index.php
Hooked up the Twig template with the front end design, currently pulling in dummy data.