Looooooots of stuff. Uploading picture now works
Merge branch 'master' of https://github.com/jeanineann/hush
Fixed merge fuckups