map scaling
Merge remote-tracking branch 'origin/master' into scalable

Conflicts:
	tugboating.js
Merge pull request #6 from tyler-weeres/scalable

Scalable