Modified .gitignore
Modified .gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore
Merge pull request #2 from monstermudder78/develop

Develop