Small adjustments.  Moved debug information slightly higher up.
Returning WeaponModel (not Object) in PlayerModel.getCurrentWeapon()
Added setShape() in Token constructor. (Required for collision detection)
Fixed the structure in setImages for Weapon-, and ProjectileToken.
Added javadoc to constructor in Model
.gitignore
Merge remote-tracking branch 'remotes/origin/Gameplay'

Conflicts:
	.gitignore