Merge branch 'master' of github.com:junyangren/BillingInfo

Conflicts:
	info.txt
Merge branch 'master' of github.com:junyangren/BillingInfo

Conflicts:
	info.txt