merged changes
Merge branch 'master' of https://github.com/jemaddux/son_of_store_engine
'merging team changes'
Merge branch 'master' of https://github.com/jemaddux/son_of_store_engine
"merging team updates"
Merge branch 'master' of https://github.com/jemaddux/son_of_store_engine
"merge team updates"
admin categories controller spec
fix admin, categories, and orders controller specs
Merge branch 'master' of https://github.com/jemaddux/son_of_store_engine
"merge team updates"
fix admin, categories, and orders controller specs