Beginning to implement new Tile class with initialize() method.
First attempt to pain with TileRenderer and MapRenderer.
Attempts to make GUI for the map, but there's a bug somewhere
Changed TileRenderer to TileImageFactory.
Tried to debug, but unsuccessful.
Further developed the MapGUITester class.
Merged with Master
trying to merge
Merged with Master
Merge branch 'master' into f19_M6_MapRenderer_Better

Conflicts:
	M6/edu.gatech.cs2340.res/edu.gatech.cs2340.res.tile_base/plain.png
	M6/edu.gatech.cs2340.res/edu.gatech.cs2340.res.tile_base/river.png
	M6/edu/gatech/cs2340/ui/MapRenderer.java
	M6/edu/gatech/cs2340/ui/TileRenderer.java
Bug fix: now displays map in GUI, adjusted sizes of all icons.
Trying to commit debugged code to master
trying to merge to master
attempting to merge