modified:   libsbe
	modified:   src/renderer/items/SimView.cpp
	modified:   src/renderer/items/SimView.hpp
	modified:   src/simulator/Creature.cpp
	modified:   src/simulator/Simulator.cpp
	modified:   src/simulator/Simulator.hpp
Merge branch 'master' of github.com:brainpower/Maximum-Fish