commit for merging from the upstream
Merge remote-tracking branch 'upstream/master'
comment out task
Merge remote-tracking branch 'upstream/master'
merge with working
added help png file, help controller and help fxml
Merge pull request #151 from liafailboy/working

added help png file, help controller and help fxml