Update .gitignore file to work with intellij IDEA

Added intellij IDEA project files to .gitignore.
A vote can now hold a comment (model change)

A vote can now hold a comment. Changes are only made in data model.
Fixed merged conflic on .gitignore