Added score counting
Merge remote-tracking branch 'repo/master'

Conflicts:
	app/src/main/java/com/example/sgm/japgolfapp/registration/MainMenuFragment.java
	app/src/main/res/values/strings.xml
Strings update