Fri AM commit, users controller modified, ordrin.rb modified
Merge pull request #30 from msmith7904/matthew_branch

Fri AM commit, users controller modified, ordrin.rb modified