Replaced tabs with spaces. PE8 bitches!
Added GreenGoblin and SwarmGobling (commented out)
Added three new grass tiles to grass1.png
Merge remote-tracking branch 'origin/master'