f
Merge branch 'master' of https://github.com/theswolf/clooudbadge.git

Conflicts:
	CloudBadge/gen/core/september/cloudbadge/R.java