New conflict test *fuel
Merge branch 'master' of https://github.com/Josh-Carrot-Caratelli/PT_Assignment2

Conflicts:
	src/Player.java