final version, not perfect but not making any more changes
Merging latop commit with work from desktop done

:w
Merge branch 'master' of https://github.com/nteissler/JavaFxDemo