Teamprop1 and bugfix added
Merge branch 'master' of https://github.com/decause/hflossk

Conflicts:
	scripts/people/2014/fall/Lynxfive.yaml
Hopefully fixed everything and added assignments
Merge branch 'master' of https://github.com/decause/hflossk
Changed bugfix1: to bugfix:
Merge pull request #515 from Lynxfive/master

Teamprop1 and bugfix added