mergining changes?
Merge branch 'master' of https://github.com/greenteawarrior/madlibbery
GUI WORKS! ~nicole and emily~