nothing
Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/osmparser/OSMParser.java