Exceptions
Merge branch 'master' of https://github.com/omisoft-dev/java-course

Conflicts:
	bkoprinski