edit .gitignore
Merge branch 'master' of github.com:LmntStudio/codie

Conflicts:
	.gitignore