added gitignore
added README
Merge branch 'maintenance' into activities-1.5