Made tile icons, borders, commented out implementation of methods
Merge branch 'master' of https://github.com/msnorth/cs2340_mule.git
Merge branch 'master' of https://github.com/msnorth/cs2340_mule.git

Conflicts:
	M6/edu/gatech/cs2340/ui/TileRenderer.java
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