ignore
Merge branch 'master' of https://github.com/pangdodo/PAMS

Conflicts:
	.gitignore