Merge branch 'develop' of https://github.com/piotrziemniak/Java-Patterns into develop
Merge branch 'develop' of https://github.com/piotrziemniak/Java-Patterns into adam
Merge branch 'master' of https://github.com/piotrziemniak/Java-Patterns into adam
3 line
change
 changes in test.db
4 line
Merge remote-tracking branch 'origin/master'
changed 3 line
Merge remote-tracking branch 'origin/master'
test.db
tomek
modyfication
Merge branch 'adam' of https://github.com/piotrziemniak/Java-Patterns into adam

Conflicts:
	state-pattern/test.db
Merge branch 'adam'
Merge branch 'develop' of https://github.com/piotrziemniak/Java-Patterns into develop
tomek
commit
Merge branch 'master' of https://github.com/piotrziemniak/Java-Patterns
.