committing
removed merge conflict
all order controller specs passing
all admin product specs passing
Merge pull request #8 from jemaddux/fixing_tests_april_11

Fixing tests april 11