Commit Assignment 2, Madlib
Merge branch 'master' of github.com:derekjuhl/itc240-2014