Update .gitignore
Merge branch 'master' of github.com:ashafein/thecms

Conflicts:
	.gitignore