Adding nbproject to .gitignore
Adding jquery
adds datafiles
Merge branch 'gh-pages' of https://github.com/iumehara/flashy into gh-pages
adding handlebars
adds id, owner_id, name to deck
Merge branch 'gh-pages' of https://github.com/iumehara/flashy into gh-pages
added card js and html template files
forgot to save the file like a noob. Card.js
updated data files
Merge branch 'gh-pages' of https://github.com/iumehara/flashy into gh-pages
building flashy js
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	datafiles/deck.json
adding icons
fixing flashy
adds deck-list json
Merge branch 'gh-pages' of https://github.com/iumehara/flashy into gh-pages
adds deck_id to decklist json
Card Rendering
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	datafiles/deck.json