Added hearts and ship attacking
Merge master