map testing 1
Merge remote-tracking branch 'origin/master' into map_generator

Conflicts:
	tugboating.js
blah
sdf
I'm commiting everything, I don't know what it is but I'm committing it
chris mapping works stage 1
Merged with master