Pathetic workaround for stupid motherfucking super restriction of one-liner
Merge branch 'master' of https://github.com/cthomp18/Pokemon

Conflicts:
	AuroraBeam.ctxt
	SandAttack.ctxt
	project.greenfoot