css
Fixed merge
Merge branch 'master' of github.com:jmejia/store_engine
working on merge problems relating to user role
All Tests Green. Fixed/wrote all pending Pending