...

...
Merge branch 'master' of https://github.com/soelynn/eProctor

Conflicts:
	bin/.gitignore
	bin/com/sherminator/model/Course.class
	bin/com/sherminator/model/Proctor.class
	bin/com/sherminator/model/Professor.class
	bin/eProctor/Main.class