commit changes
commit changes
js on upload page
merge resolved
Merge pull request #8 from alankalter/juan

Juan