Merge origin/master

Conflicts:
	flazhcards.html