Merge pull request #1 from renechz/master

Basic Browsing.
fix conflicts
fix conflicts
Merge branch 'master' of github.com:renechz/s3_browser
Merge pull request #2 from renechz/master

Updated gitignore