new conversation button added, css file for conversations renamed
Merge branch 'master' of github.com:fredmcgroarty/language_learning_project
Merge branch 'master' of github.com:fredmcgroarty/language_learning_project