working on making style catch
Merge branch 'dev'
Merge branch 'master' of github.com:ACRSupply/ACR-WordPress