Merge branch 'gh-pages'

Conflicts:
	cards/index.html
	static/js/bns-cards.js