Test2
merge

Merge branch 'master' of github.com:danielab/EmergencyGame

Conflicts:
	DjangoApp/templates/index.html