Merge branch 'master' of https://github.com/wanderinweezard/ForestRanger

Conflicts:
	ranger.rb
Merge branch 'master' of https://github.com/wanderinweezard/ForestRanger

Conflicts:
	ranger.rb