Stashing changes
Merge branch 'master' of github.com:arnarthor/bee-on-sea
map fix
Merge branch 'master' of github.com:arnarthor/bee-on-sea