activator changes
Merge branch 'master' of https://github.com/dmb2bt/CS3240-Group-19

Conflicts:
	Prototypes/DeliveryPrototype/bin/Activator$2.class
	Prototypes/DeliveryPrototype/bin/Activator.class
	Prototypes/DeliveryPrototype/src/Activator.java
Merge branch 'master' of https://github.com/dmb2bt/CS3240-Group-19