stash
Merge branch 'IPHC-milka-friend' of https://github.com/smartell/iSCAM into IPHC-milka-friend
writesimdatafile added to milka.cpp
stash
merge withSteve's edits