Merge branch 'master' of https://github.com/justinslack/ctfeds

Conflicts:
	.gitignore
Deleting
Delete