Merge branch 'master' of github.com:ec-sft/asteroids

Conflicts:
	src/main/java/com/ecsoft/asteroids/model/Projectile.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 2 different commits each, respectively.
#
# Changes to be committed:
#
#	new file:   src/main/java/com/ecsoft/asteroids/model/BulletExpired.java
#	modified:   src/main/java/com/ecsoft/asteroids/model/Projectile.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   src/main/java/com/ecsoft/asteroids/controller/Controller.java
#	modified:   src/main/java/com/ecsoft/asteroids/model/SettingBox.java
#	modified:   src/main/java/com/ecsoft/asteroids/model/SettingsManager.java
#	modified:   src/main/java/com/ecsoft/asteroids/view/View.java
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	target/
Merge remote-tracking branch 'origin/master'