remove upload folder
Merge branch 'master' of github.com:biocore/qiita into file-upload
Merge branch 'master' of github.com:biocore/qiita into file-upload
Merge branch 'master' of github.com:biocore/qiita into file-upload
Merge branch 'master' of github.com:biocore/qiita into file-upload
Merge branch 'master' of github.com:biocore/qiita into file-upload
initial commit
Merge branch 'master' of github.com:biocore/qiita into file-upload
Merge branch 'master' of github.com:biocore/qiita into file-upload
qiita_db.util.get_user_fp
file upload
Merge branch 'master' of github.com:biocore/qiita into file-upload
fixing pep8 errors
addressing comments
addressing squirrelo comments
Fixing conflicts
Merge pull request #328 from antgonza/file-upload

File upload