timeline render part 2
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
Update FXMLController.java
Update Timeline_fxml.fxml
Update AtomicEvent.java
Update DurationEvent.java
Update Event.java
Update IO.java
Update Timeline.java
Update driver.java
merged
trying to merge
Merge pull request #9 from connerv/master

From Conner "Something messed up, but I'm pretty sure what I have right now is good"