updates
Merge branch 'master' of https://github.com/Amp-Package-Manager/amp

Conflicts:
	.gitignore
	script/test.sh