Commit stupid
Merge branch 'javaify' of https://github.com/johnaidenrohde/rogueAgent into javaify

Conflicts:
	Point.java