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
Dijkstra and enemies

Basic enemy skeleton, implemented Dijkstra’s algorithm in Grid
Merge branch 'dev' into #70-Enemies
Do nothing if player move command received after its death
Random Monster

Monster moves randomly…stalls once in a while (probably an error with
calculating possible moves)
Line and PathFinding enemies now functional
Refactoring
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 remote-tracking branch 'origin/dev' into #44_player_collision_fix
Merge pull request #99 from oharaandrew314/#70-Enemies

#70 enemies
Merge remote-tracking branch 'origin/dev' into #44_player_collision_fix

Conflicts:
	src/server/controllers/Server.java
Merge pull request #104 from oharaandrew314/#44_player_collision_fix

Do nothing if player move command received after its death
Merge branch 'dev' into #87-powerups

Conflicts:
	src/common/models/Player.java
Add player id to server player accept message