sf2
Merge branch 'master' of https://github.com/alendormy/projectq

Conflicts:
	.gitignore
	LICENSE
	README.md
merged