Combines shots and fireballs into one list.
Merge pull request #11 from rliebz/onelist

Combines shots and fireballs into one list.