Merge branch 'master' into gh-pages
test
Merge branch 'gh-pages' of github.com:florentsolt/hearthstone-synergies into gh-pages