add simutime
Merge branch 'master' of https://github.com/anetaaneta/kupakupa

Conflicts:
	kupakupa.cc
	parseXml.cpp