Revert "Merge branch 'master' of https://github.com/wlouthe/490Project"

This reverts commit 3d3526b04938d2bb619ab82aa0854aabe38ae765, reversing
changes made to c1f05234501ae7ee0a36b6c9e9ed8fc88971be6f.