Added meetup1

Added link of meetup1 for RocPy
Merge remote-tracking branch 'origin/develop'
Merge branch 'master' of github.com:xingnx/hflossk into xingnx-master

Conflicts:
	scripts/people/2014/fall/xingnx.yaml
Merge branch 'xingnx-master'