Bio
Merge commit '2eed8bb3285fc837ea1eb43d9704b6c17d20e737'

Conflicts:
	Bakterie/src/pl/edu/uj/fais/amsi/main/Game.java