john comment
Merge remote-tracking branch 'origin/John' into Version-1.0

Conflicts:
	src/codesample/timeline/Timeline.java
Merge branch 'Version-1.0' of https://github.com/DevolvingSpud/timeline-analyzer into Version-1.0

Conflicts:
	src/codesample/timeline/Timeline.java