Commit
com test
h
d
Merge branch 'master' of https://github.com/easyLearn/easyLearn.git

Conflicts:
	src/MainGui.java