scratchPad.html: delete
Merge branch 'meteor' of https://github.com/HRR1SRS/SpacedRepetition into meteor
restructure dashboard and insert 'add card' form
wip: users queues, topcis, cards
fix index.html merge conflicts
Merge pull request #64 from therobinkim/meteor

restructure dashboard and insert 'add card' form
fix merge conflicts in client.js index.html
Merge pull request #65 from chrbradley/meteor

wip users queue, topics ,cards
Merge branch 'meteor' of https://github.com/HRR1SRS/SpacedRepetition into meteor
fix syntax error