commiting something
Merge branch 'master' of https://github.com/tomaszkolonko/ese2014_warmup2

Conflicts:
	Skeleton/src/main/java/org/sample/model/Team.java