changed naming conventions
Merge branch 'master' of https://github.com/Barrun3/golfApp.git