Client-side SHA1
Merge branch 'new'
Added new files
Merge branch 'new' 2
Added upload folder