Merge branch 'master' of https://github.com/amir-arad/Artifacts

Conflicts:
	.gitignore