.gitignore created by brackets-git extension
Initial commit
Merge branch 'master' of https://github.com/enlosnervios/fanzine

Conflicts:
	.gitignore