asd
Merge github.com:krstan4o/courceProjject

Conflicts:
	KPK