Merge origin/master

Conflicts:
	.gitignore
	README.md
Revert "Merge origin/master"

This reverts commit 3749d1409ce56b352a09bb66c2813aced39290fe.
Merge remote-tracking branch 'origin/master'
Merge origin/master

Conflicts:
	.gitignore
	README.md