turtlemansam is so high-maintenance.
Merge branch 'master' of https://github.com/steppin/tagpro-maps into steppin-master

Conflicts:
	oval.json
	swoop.json
	swoop.png
Merge branch 'refs/heads/steppin-master'