adds andys changes
fixes conflicts from merge
Merge branch 'master' of github.com:Codystringham/golfcrony