added bootstrap
load staticfiles
merge
Merge branch 'master' of github.com:danielab/EmergencyGame

Conflicts:
	DjangoApp/templates/base_site.html