testing booking spec
Merge branch 'master' of https://github.com/fredmcgroarty/language_learning_project
sending messages spec is sorted
sorted topics tests
doing topics tests
Merge branch 'master' of https://github.com/fredmcgroarty/language_learning_project
Merge branch 'master' into tests
Merge branch 'master' of https://github.com/fredmcgroarty/language_learning_project
about to merge recent master from mark, languages removed from topics
Merge branch 'master' into tests
booking tests pass
all tests fixed and passing
styled settings and javascpt form render
fixed conflicts on merge
merged with master