commit
Merge branch 'master' of https://github.com/szmitas/magisterka.git

Conflicts:
	src/comunication/Article.java
Merge branch 'master' of https://github.com/szmitas/magisterka.git
dodalem tekst