added attack messages and and added "bullets" and their collision code.
need to think of better way of getting each entities component, but might
be fine to just check as a null (look at gameloop code for example)
added attack action and bullet class
fixed merge issue (using tims fixes)
Merge pull request #18 from ayaigame/attacking

Attacking