Merge remote-tracking branch 'upstream/master'
merge
merging
user review controller
Merge branch 'master' of github.com:fredmcgroarty/language_learning_project
Merge remote-tracking branch 'upstream/master'
language level optimazed
Merge pull request #36 from RuslanVikhor/master

language level optimized
Merge branch 'frontend'
added user reviews and linked to lessons
Merge branch 'master' into db_changes

merging
edited lessons show page
sorted conflicts
fixed font bug
fixed font