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
merge conflict