Update README.md
NB
NB
NB
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore