commit before pulling master
Merge branch 'upstream_merge'
merging upstream
ordered item controller tests complete
Merge pull request #31 from nickpassarella/master

Ordered Item controller tests finished
handled conflict