log4j a .gitignore nemusia byt v git repo
Merge branch 'master' of https://github.com/Marine-22/BOC

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Marine-22/BOC

Conflicts:
	src/main/webapp/WEB-INF/classes/log4j.properties
Finalna verzia