uploading files
Updated voting for inbox
Merge branch 'master' of https://github.com/matanvr/thisorthatmaster
merging