Turn 4, part 2 - voting on rule-change 322
Merge branch 'master' of https://github.com/jameseb7/HackNomic

Conflicts:
	rule-changes/rule-change-322.md