Update snapschott.yaml
Update snapschott.yaml
Update MrNex.yaml
Add team prop1 and meetup linkage
Merge pull request #506 from MrNex/patch-1

Update MrNex.yaml
Merge pull request #507 from kocsenc/kocsen-yamlupdate3

Add team prop1 and meetup linkage
Merge branch 'master' of github.com:snapschott/hflossk into snapschott-master

Conflicts:
	scripts/people/2014/fall/snapschott.yaml
Merge branch 'snapschott-master'. Closes #498
Merge branch 'master' of github.com:decause/hflossk
Update snapschott.yaml
Update MrNex.yaml
Add team prop1 and meetup linkage
Merge branch 'master' of https://github.com/decause/hflossk