Update README.md
Update README.md
Updated .gitignore
Merged master with dev
Merge branch 'master' into dev

Conflicts:
	.gitignore