.gitignore
Merge branch 'develop'

Conflicts:
	.gitignore
Fixed bugs
.gitignore