Merge branch 'Aiden's' of https://github.com/johnaidenrohde/rogueAgent into Aiden's

Conflicts:
	Agent.java
No conflicts