Minor updates
Merge branch 'master' of https://github.com/comp380-group1/wer2

Conflicts:
	src/main/DataManager.java