simple map
Merge branch 'master' of https://github.com/tuxmachine/deerling

Conflicts:
	deerling.ino