Reordered
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/users.yml
Orig file removed