Update README.md
Update README.md
Update README.md
Update .gitignore
Update .gitignore
Update README.md
Merge branch 'bugfix'

Conflicts:
	README.md
Merge branch 'master' into DEV

Conflicts:
	README.md