message views refactored
Merge branch 'messages'
about to add usernames to users
about to merge with aster, added usernames and generate user profile upon devise account create
merged with marks stuff
password change aded to edit page
merged master
conversations controller and views
Merge branch 'master' of github.com:fredmcgroarty/language_learning_project
Merge branch 'messages'
edit page fix
Merge pull request #10 from RuslanVikhor/master

edit page fix