Fixed Next, need help with previous
nothing
Next and previous working
merge changes
Merge branch 'Version-1.0' of https://github.com/DevolvingSpud/timeline-analyzer into Version-1.0

Conflicts:
	src/codesample/timeline/Timeline.java
	test/codesample/timeline/TestTimeline.java