add 2
add 2
Merge remote-tracking branch 'origin/bugFix'
add 3
add 4
Merge remote-tracking branch 'origin/bugFix' into bugFix

Conflicts:
	src/pl/altkom/phonebook/Start.java
add 5
add a
add b