Push changes from local.
Merge branch 'master' of github.com:discoverygarden/UofM-Theme
Merge pull request #2 from jordandukart/7.x

7.x