a few mods
a few
Merge branch 'master' of https://github.com/OSHWL/candidates

Conflicts:
	contents.txt
Merge branch 'master' of https://github.com/OSHWL/candidates

Conflicts:
	contents.txt
Merge branch 'master' of https://github.com/OSHWL/candidates