Added .gitignore
added README
Merge branch 'master' into activities-3.0