change loyalty
whitespace
Merge branch 'master' into another-closer-edit

Conflicts:
	order.rb
Merge pull request #2 from ngzax/another-closer-edit

Another closer edit