Merge branch 'develop'
updated gitignore
Merge branch 'develop'
updated gitignore
added README content
Merge branch 'master' into develop