Merge branch 'master' of https://github.com/decause/advfoss
added commcont5
Merge branch 'commcont5' of github.com:qwertos/advfoss into qwertos-commcont5

Conflicts:
	scripts/people/qwertos.yaml
Merge branch 'master' of github.com:decause/advfoss