I added an awesome comment.
Merge branch 'master' of https://github.com/scdickson/project5.git

Conflicts:
	Graph/src/MapEditor.java