upd
Merge branch 'master' of github.com:obashtovoj/CourseJava

Conflicts:
	bin/edu/collections/SetExample.class
	bin/edu/oop/StaticExample.class
	src/edu/collections/SetExample.java
	src/edu/oop/StaticExample.java