foo
Merge branch 'master' of github.com:arnarthor/bee-on-sea

Conflicts:
	images/Thumbs.db
	maps/Thumbs.db
Stashing changes
Stashing changes
Stashing changes
Stashing changes
Stashing changes
Stashing changes