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' of https://github.com/msnorth/cs2340_mule

Conflicts:
	M6/edu/gatech/cs2340/ui/MapRenderer.java
	M6/edu/gatech/cs2340/ui/TileRenderer.java
Dummy commit