classes done
Merge origin/master

Conflicts:
	res/crests1.fifo
	res/crests2.fifo
	res/crests3.fifo
	res/crests4.fifo
	res/crests5.fifo
	res/crests6.fifo
	src/com/bermudi/fifi/Team.java
	src/com/bermudi/fifi/TestMain.java
Merge origin/master

Conflicts:
	res/crests1.fifo
	res/crests2.fifo
	res/crests3.fifo
	res/crests4.fifo
	res/crests5.fifo
	res/crests6.fifo
	src/com/bermudi/fifi/Team.java
	src/com/bermudi/fifi/TestMain.java