changing branches to users
working on charts commiting to merge
merge conflict fixs
Merge branch 'master' of https://github.com/zoeames/Vichan into SarahUsers
committing so i can merge
merge conflict
changes to the front
showall table css, user model slight change
merge conflict
merge conflict
profile
merge conflict
message merge conflict
profile merge conflict
messages integrated
Post merge
merge conflict resolved