Update stuff
Merge branch 'master' of https://github.com/cdances/NUCE_470_project

Conflicts:
	Steam_Generator/Steam_Generator.tex