Added JavaFX library locally to the project
Fixed merge errors
Changed classpath to work on laptop....