Added gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore
	README.md