changed arrayList required sport objects on the idTypeRequiredSportObject
added method athleteCollision and method allSportObjectOnTypeId
 added method athleteCollision and method allSportObjectOnTypeId
changed arrayList required sport objects on the idTypeRequiredSportObject
Update shared.iml

Проект теперь нормально собирается.
P.S. специально для Ромы =)
Merge pull request #26 from MOHAX239/master

methods for Roman (athleteCollision and allSportObjectsByType) and changed Competition
Merge pull request #27 from danyaberezun/master

Abracadabra
Merge branch 'master' of https://github.com/anlun/olympIS

Conflicts:
	shared/shared.iml
	shared/src/beans/Competition.java