ledges done
added baddies
fixed merge conflicts
changed baddie placement
Merge pull request #2 from LizaHCarter/liza

Liza