NEW, will be some errors but old code was junk
NEW, will be some errors but old code was junk
Merge remote-tracking branch 'origin/doodle' into doodle

Conflicts:
	src/Nazgul.java
	src/Oliphant.java
	src/RiderOfRohan.java
	src/ShootingGallery.java
NEW, will be some errors but old code was junk