Removed /characters/*
Merge branch 'master' of https://github.com/tomfischerr/Prosper.git

Conflicts:
	characters/Tom/map/layer1