Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
merge
added 2 new classes
Merge pull request #7 from connerv/master

TimelineRender  v1
Creating individual event variables
Modified events to accomodate int values
updated contribution txt
Merge pull request #8 from ajsudds/master

Merge pull request #2 from KurtAndres/master
Got to compile by moving fxml into working directory
Merge branch 'master' of https://github.com/KurtAndres/timeline
Added driver test case, and a simple test timeline with 4 events.
Merge pull request #3 from KurtAndres/master

new request