Manual Merge of joeyimage:patch-1

Pull request:
https://github.com/samurailink3/hangouts-against-humanity/pull/19

Needed manual merge to keep up with card numbers.
Fixed some formatting issues.