Re-initialised site
bleh
Merge branch 'master' of https://github.com/JakeCowton/assassinGame

Conflicts:
	.gitignore
bleh