Bootstrap Theme
Frage
Merge branch 'master' of https://github.com/nahatle/MiniProjekt1_IntTec

Conflicts:
	Miniprojekt1_IntTec/WebContent/index.xhtml