Revert "Merge branch master of git://github.com/pcpratts/rootbeer1.git"

This reverts commit 3febf9be4763a09a1815942161b366dff8683baf.