styling
Merge branch 'master' of https://github.com/brianyingling/gradr

merge conflicts resolved