Many changes.

Much fun.
Merge branch 'master' of https://github.com/brj424/The-Sawyer-Trail

Conflicts:
	src/Runner.java