Merge branch 'master' of https://github.com/MathHeads/Engineeringprojects

Conflicts:
	Critical Component/Budget
pictures
Merge branch 'master' of https://github.com/MathHeads/Engineeringprojects