deleting shit
Merge branch 'master' of https://github.com/jongisli/AJP_assignment2

Conflicts:
	assignment2/ASubscriber.java