Initialize repository
Merge branch 'master' of https://github.com/tponte/open_democracy

Conflicts:
	.gitignore