tasks 1-4
Merge branch 'master' of https://github.com/lozenko/java4sdl

Conflicts:
	J02-OOP/students/firefox/.idea/workspace.xml