Merge branch 'meteor' of https://github.com/HRR1SRS/SpacedRepetition into meteor
Merge branch 'meteor' of https://github.com/HRR1SRS/SpacedRepetition into meteor
Merge branch 'meteor' of https://github.com/mdaxtman/SpacedRepetition into meteor
minor syntax errors fixed