Merge branch 'add-a-list-of-cards-with-special-rarity'
Complete details of 《オアシスの美姫エムシエレ》

Source: http://hatokura.flipflops.jp/wordpress/archives/946
Complete details of 《オアシス都市ネフェルティリ》

Source: http://hatokura.flipflops.jp/wordpress/archives/946
Merge branch 'update-for-fourth-preview-of-six-cities-alliance'
Tidy up spacing around links in #about
Tidy up spacing around links in #tips
Merge branch 'tidy-up-spacing'
Fix rarities of 《呪い》 and 《見習い侍女》

These cards are defined as basic according to page 6 of
http://hatokura.flipflops.jp/wordpress/files/2012/02/hoc2_manual_web2.pdf
Update the title of #reference:rarity-basic
Merge branch 'update-card-rarities'
Unleash include_six
Unleash #supplies:six
Complete information of Six-Cities Alliance cards
Define recommended supplies of Six-Cities Alliance
Merge branch 'complete-six-cities-alliance-information'
Fix to add missing semicolons
Fix duplicated variable definitions
Fix positions of line breaks
Fix problematic comparisons
Merge branch 'lint-a-bit'

Related to: gh-101