build system
Merge branch 'master' of github.com:chatoooo/SIN

Conflicts:
	src/cz/vutbr/fit/sin/SimulationRunner.java