tweaks
Added some cards
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	index.jade
Added some cards