Things I Did In Class
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spectrum/Library/guidmapper
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

Conflicts:
	Spectrum/Library/guidmapper