Merge branch 'master' of github.com:ksundberg/CS6300 into repeatfix

Conflicts:
	Optimizations/Optimizer.cpp