adding files
Merge branch 'master' of https://github.com/ppapageorgiou/votemvt

Conflicts:
	.gitignore