added user_avatar method to user model. can be called to show either uploaded or default avatar. also added image and name links of the other person in the chatroom to the top of the chat page
merge conflicts
merge conflict
README
fixed syntax error that broke chat
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Added bootstrap tagsinput
prior to pulling tags fix
removed extra 'Back to item' button from chatroom
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
bootstrap-tagsinput.js added to vendor assets
sign in form is now a modal
slight modification to modal header
edited bootstrap-tagsinput.js
Corrected typo
changed sign up shared devise message
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Minor correction
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
removed one line break