added some text to readme
Merge branch 'develop'
changed gitignore