refactoring...
refactoring: adding more bootstrap components
refactoring...
madlib option 2 done.
madlib option 2 done.
Merge branch 'madlibs_opt1'
refactoring
Merge branch 'mablib2'

Conflicts:
	madlibs/css/main.css
	madlibs/index.html