updated..
Merge branch 'master' of https://github.com/s3287015/cc_assignment

Conflicts:
	src/controllers/InputDialogController.java
	src/controllers/InputDialogWindow.java
	src/controllers/MainWindowController.java
	src/views/InputDialog.fxml
	src/views/icons/home.png
	src/views/icons/notes_add.png
	src/views/icons/plus.png