fixing git issues
Re-uploading Jon's gitignore, with my personal changes added in.
re uploading
hope this works ok, stupid db files...
some additional error handling, progress on new cohort functionality
bigger icon
Working edit assessment tab.
fingers crossed 2......
fingers crossed 3......
Merge branch 'gui' into develop

Conflicts:
	.gitignore
	src/gui/Data.java
	src/gui/DisplayCE_PopulateEditAssessment.java
	src/gui/DisplaySettings_PopulateBackupRestore.java
	src/gui/MainUI.java
	src/gui/PopupWindow.java
	src/orm/BaseStudent.java