Merge pull request #11 from adamreis/submission2-generalize

Submission2 generalize
Merge branch 'master' into resource-calculations