Merge branch 'PathFinding' of https://github.com/Jbtyson/cis580-rts into PathFinding

Conflicts:
	rts/index.html
	rts/src/units/hoplite.js
	rts/src/units/unit.js