blabla
Merge branch 'master' of https://github.com/Gration1/webtechGH12

Conflicts:
	resources/css/style.css