Added power ups
Merge branch 'dev' into #87-powerups
added some comments
added .metadata/ to gitignore
added unit tests for player picking up power ups
Merge branch 'dev' into #87-powerups

Conflicts:
	src/server/controllers/Server.java
Added Integration test for power ups
Added unit and integration test to Test Suite
Merge branch 'dev' into #87-powerups

Conflicts:
	src/common/models/Player.java
Most of the requested changes were made
check invulnerability on collisions
removed unused attributes - added canBeHurtByMethod to player
Merge branch 'dev' into #87-powerups
changed canBeHurtBy method and added it to Unit
Added isInvulnerable to Unit returning false
added isImmuneToBombs to Unit returning false
changed killPlayer to killUnit

killUnit should handle killing both players and enemies
removed commented out code
changed order for checking win and power up
Merge pull request #102 from oharaandrew314/#87-powerups

#87 powerups