271
Merge branch 'master' of github.com:mjpete3/x12

Conflicts:
	lib/x12/version.rb