import Margie's cards into Dean's index.html
Merge branch 'zoie' of https://github.com/deanwenick/nfz into zoie
enable bootstrap for production
Merge branch 'zoie'

Conflicts:
	app.js