Map tile editing complete
Merge branch 'master' of github.com:fm2munsh/Pokemon into server