Very simple moving around
Merge branch 'master' of https://github.com/iluu/ruby-dash

Conflicts:
	lib/map.rb