Deleted my dis project to pull Gavin's renamed one
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix

Conflicts:
	Design/Ontario.dia