Profit and Risk and shit
Merge branch 'master' of https://github.com/mfiels/arm-chip-skateboard

Conflicts:
	js/map.js