Merge branch 'master' of https://github.com/paltest/pal

Conflicts:
	.gitignore
	LICENSE