Added sublime project files to gitignore.
Merge branch 'master' into dev

Conflicts:
	.gitignore