little changes
little changes
minor changes
minor changes
niiice
renaming oops
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/SubjectsData.java
	src/main/java/com/neptunusz/view/NeptunuszDialog.java