Merge pull request #8 from frekfra/master

added some menu functionality and two new weapons to enemies.
Music.

Some music that I forgot to add.
MAGIC

I can't find how the player was instanciated....yeah
Merge remote-tracking branch 'upstream/master'

Conflicts:
	GDCalaga/highscore.dat
Changed magic number velocity in Gun class to use constructor parameter.
Implemented fly-in sequence for when player starts/dies.