Dr. Woodfield's notes on Combined_Gavin.dia.
Another tweak to Combined_Gavin.dia.
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix

Conflicts:
	Design/Combined_Gavin.dia
added the near-final draft to designs