Add spoiler tags
Merge branch 'daviddavis-temp/20140531152248'