Ignore file
Merge branch 'master' of https://github.com/andrewburgess/cms

Conflicts:
	.gitignore