Opis projektu
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	README.md
formatting
Merge remote-tracking branch 'upstream/master' into develop