pull
Merge branch 'master' of https://github.com/zoeames/VIchan into matt2
camera saving user profile pic
merged with master
webcam merged to master