directions
Merge branch 'master' of https://github.com/blaavogn/BFST

Conflicts:
	src/data/MapDataModel.java
	src/data/MapDataModelIF.java
Merge branch 'master' of https://github.com/blaavogn/BFST