Added meetups
added curriculum and team prop 2
Added vidreview and rocpy
Merge branch 'master' of https://github.com/decause/hflossk

Conflicts:
	scripts/people/2014/fall/anjelz.yaml
Adding vidreview and meetups
Fixing .yaml
Merge pull request #580 from anjalitewari/master

Adding vidreview and rocpy