.
Merge branch 'master' of https://github.com/benracine/shg-december-2014