Squid and Shark enemies added
Merge remote-tracking branch 'upstream/master'
Include Brad's files.