editing madlibs.py
zane is awesome
Merge branch 'master' of github.com:stuycs-softdev/submissions

Conflicts:
	6/Luo_Jason/madlibs.py
Merge branch 'master' of github.com:stuycs-softdev/submissions