Merge origin/master

Conflicts:
	Assignment2/src/repository/Console.java
	Assignment2/src/repository/Input.java
Merge origin/master