Test marshall was here
Merge branch 'master' of https://github.com/apche93/CS3240.git

Conflicts:
	Activator/src/Activator.java