* Added .gitignore file
Merge branch 'develop' into 'master'

Conflicts:
	.gitignore