Merge origin/master

Conflicts:
	src/Sprint1/dao/NewClass.java
Merge origin/master