A random commit before I pull, not done with anything.
Merge branch 'master' of https://github.com/strikerz76/Yashrukor_2
Attempted pathfinding, but failed.
Merge branch 'master' of https://github.com/strikerz76/Yashrukor_2.

Conflicts:
	src/main/Thing.java