Merge pull request #5 from clhenrick/master

master merge from faculty
Merge pull request #1 from josephrmoore/master

Merge pull request #5 from clhenrick/master