nowy commit
Merge branch 'master' of github.com:pscigala/VocabApp

Conflicts:
	src/vocabapp/VocabApp.java