Unfinished voting
gitignore
merge
Fixes for layout