Added door input functionality to input text files.
Putting a 2 into a test file will add a door
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/bomberman/Server.java
Merge branch 'master' of https://github.com/jals/JCVSBomb