Cleaning and refactoring
Added new static method for grid-creation (wip)
Merged Thomas changes, resolved conflicts and cleaned up
Another cleanup
Merged Thomas changes and cleaned stuff up
Moved grid-creation in seperate static method of DisplayGrid
pre-merge commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/map_drawing/DisplayGrid.java
	src/map_drawing/Tile.java
	src/map_making/MainClass.java
Merge remote-tracking branch 'upstream/master'
- Added View as interface; implemented by TwoDView and IsometricView. Simplifies displayGrid-method
- cleanup
removed old view-type
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/map_drawing/DisplayGrid.java
	src/map_making/MainClass.java
Merge branch 'master' of https://github.com/MrSchneepflug/java.drawing into MrSchneepflug-master

Conflicts:
	src/map_drawing/DisplayGrid.java
test