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
Merge pull request #2 from wuaiwuai/master

more quotes/images, added bounce.js animation
data
frink
quotes/pics
data
starting work on switching js to use google spreadsheet json
main.js now creates array of objects from the google json feed
removed local json and added entries to google doc