added diego sprites, consolidated charge code
Merge branch 'master' of https://github.com/hentaiphd/GrassStains

Conflicts:
	src/Player.as
Merged, then added fall stuff.