gs
Merge pull request #10 from stites/master

browse/upload
resolve - master conflicts