Added time parsing
resolving conflicts
resolving some git problems
Merge branch 'timeExtractor' into develop