MOAR GUI
Merge branch 'master' of https://github.com/seanjames777/15214

Conflicts:
	src/edu/cmu/cs/cs214/hw5/framework/Data.java