The latest version the professor e-mailed us...
Merge branch 'Kevin' into feature/Daniel
Merge branch 'feature/Chris' into feature/Daniel