ENIE stuff
Merge branch 'master' of https://github.com/aweinstock314/software_design_and_documentation_fall2014