u
Merge github.com:mrotmensch/DS-GS_1007-Project

Conflicts:
	Project/graphicOutput/heatmap.pyc
comments added and revised