Merge branch 'ficdom-master'

Conflicts:
	src/com/company/Main.java
usuwanie insert1 i insert2
po mergu