gave rick 3 lives, refactored creating player
replaced rick sprite
merged conflicts
Merge pull request #14 from albertodotcom/dev_ed

Dev ed