Merge template
Merge branch 'master' of https://github.com/Fhenris3310/Hunger-Games-Website

Conflicts:
	app/views/template.blade.php