Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/mattmc318/checkers into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	resources/style.css
Merge branch 'master' into gh-pages
Whoops, better put the full URL.
favicon, you work now, yes?
*grumble*