Added gitignore
add readme
Merge branch 'master' into activities-3.0