working
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/proj1/RegistrationAgent.java
eh