testing merge again
Resolved
Merge branch 'Version-1.0' of https://github.com/DevolvingSpud/timeline-analyzer into Version-1.0