Player now uses Gun class for weapon.
Player now has three lives. When player loses all health a life will be lost.
Added "graphical" heads-up-display with player lives, health, and current weapon name.
removed debug log from highscoreList class.
refactored gun parameter names.
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.
Update .gitignore

ignoring highscore.dat
Update .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	GDCalaga/highscore.dat
	GDCalaga/src/org/gdc/gdcalaga/Gun.java
	GDCalaga/src/org/gdc/gdcalaga/PlayState.java
	GDCalaga/src/org/gdc/gdcalaga/Player.java
committing missing stuff from bad merge.
Merge pull request #12 from frekfra/master

Added fly-in when player starts game and when the player respawns + small fixes.