New Design
Merge branch 'master' of https://github.com/FTC7347/Documentation

Conflicts:
	EngineeringNotebook/EngineeringNotebook.tex