stuff
concise
Merge branch 'master' of https://github.com/jgwil2/simpsons-quotes
ok

Conflicts:
	js/main.js
grr
var
Merge branch 'master' of https://github.com/jgwil2/simpsons-quotes
data
frink