Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
addresses issue #90
removed overwrite of locations.json file
#132 Moves exsisting unit test to their belonging package.
#132 Removes unused imports
#134 Create BDD feature
#134 Renames feature
Adds cucumber dependencies
Adds steps
Moves feature to better location
#134 Makes running the test for each Feature easy, with JUnit @RunWith
Merge pull request #135 from verhagen/134-bdd-sample

134 bdd sample
Merge pull request #133 from verhagen/132-move-unit-tests

132 move unit tests
Merge branch 'verhagen-132-move-unit-tests'
Merge branch 'master' of github.com:Progether/JAdventure
Merge branch 'master' of https://github.com/paddatrapper/JAdventure into paddatrapper-master

Conflicts:
	src/main/java/com/jadventure/game/prompts/CommandParser.java
Merge branch 'paddatrapper-master'
Merge pull request #131 from paddatrapper/server

Addresses #90