initial commit
Merge branch 'master' of github.com:DemocracyClub/Blog

Conflicts:
	.gitignore