Merge pull request #6 from bbaloo/master

fix merge conflicts
Update README.md
Update README.md
- add connect to mainactivity
Merge branch 'master' of https://github.com/yoman07/PhotoShoter
merge