add effects and fucntion for scores
Merge branch 'add_function_for_combo' into Version1.0

Conflicts:
	gen/com/klabcyscorpions/boom/R.java