Disabling mapedit from master
Moving into a branch for mapedit work
Merge branch 'master' of https://github.com/gazliddon/blittin

Conflicts:
	src/index.html