Merge Conflict Example
Merge branch 'master' of https://github.com/nicktardif/SDC-Treemap

Conflicts:
	README.md