fix menu bugs
Merge branch 'master' of https://github.com/allenpark/cardblocks

Conflicts:
	cardblocks.js