edit gitignore
Merge branch 'master' of https://github.com/cssghost/cms

Conflicts:
	.gitignore