Updated with javadoc comments
Updated with javadoc comments
Deleted some of your classes in order to pull
Deleted some of your classes in order to pull
Merge origin/master

Conflicts:
	Assignment2/src/repository/Input.java
	Assignment2/src/repository/User.java