news
Merge branch 'gh-pages' of https://github.com/bestian/pokercard into gh-pages

Conflicts:
	edu.html