commit macaroon
commit macaroon
Merge branch 'master' of github.com:ZongYi-Ali/Macaroon

Conflicts:
	VERSION