working gen?
Merge branch 'master' of https://github.com/jsmonson/FinalProject620