Adding in what I have done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Exceptions/ExceptionHandler.java