making scoring work
Merge branch 'master' of https://github.com/fletch3555/FreeForAll

Conflicts:
	src/org/exf7630/freeforall/FreeForAllActivity.java