soldier#index looks good and works well
fixing conflicts
Merge pull request #33 from ManyBaby/post-merge-fixes

soldier#index looks good and works well