commit to resolve merge conficts
Merge branch 'master' of https://github.com/clubberstake/Golfr