Removed bad file
Merge branch 'master' into biggerfisch

Conflicts:
	templates/home.html