Reverted last changes. Trains stop at stations. Removed some troublesome asserts
Added graphics binary
Merge branch 'master' into makefiles

Conflicts:
	engine/engine.cpp
	engine/engine.hpp