Added new option --time-max
Merge branch 'master' of github.com:marcelTBI/DSUeval

Conflicts:
	DSUeval.ggo