Updated with Dan's hamalamadingdong server
Merge branch 'master' of github.com:dgriff03/mapbuilder

merged with dan