actionmanager update
Merge branch 'master' of https://github.com/cs2340-team-20/mule

Conflicts:
	src/cs2340/team20/mule/ActionManager.java