Commit after Stage 1 was due..
Merge branch 'master' of https://github.com/omnivescence/156-project
Commit after first due date.