iteration 2
Merge branch 'master' of https://github.com/szczepiq/cbe

Conflicts:
	team5/src/test/java/SeatsNumberTest.java