Merge pull request #2 from KurtAndres/master

new request
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.
Updated FMXL controller

Added Functionallity
Upated timeline fxml added functionality
Update Timeline_fxml.fxml
committt
editing project properties
trying ot merge..

Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	classes/FXMLController.java
	classes/Timeline_fxml.fxml
	nbproject/project.properties
merged
trying to merge