Big belly time!
Merge branch 'alistar-buddha'

Conflicts:
	quotes.html