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

Conflicts:
	src/eProctor/Main.java