Merge branch 'master' of https://github.com/teddyxfire/SEMINAR2

Conflicts:
	bootstrap/css/main.css
	grad.html
nešto