removed todo comment
added upload
Merge branch 'dev' of https://github.com/codexa/pictroid into dev