ignoring generated stylesheets and sass cache
Merge branch 'master' of github.com:EchoVantage/canyon-theme
updating theme to be more adherant to wp conventions