[master] readme
Merge branch 'master' of github.com:andykallhoff/army-height-weight

Conflicts:
	README.md
[master] readme