Module files
Merge branch 'master' of https://github.com/cdunlopp/SaveTheSemester

Conflicts:
	target/SaveTheSemester-1.0-SNAPSHOT/WEB-INF/web.xml
	target/SaveTheSemester-1.0-SNAPSHOT/addFiles.jsp
	target/SaveTheSemester-1.0-SNAPSHOT/index.jsp
	target/classes/lib/Keyspaces.class
	target/classes/models/ModuleModel.class
	target/classes/servlets/LogIn.class
	target/classes/servlets/ModuleFiles.class
	target/classes/servlets/addFiles.class
	target/classes/stores/LoggedIn.class

	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst