added votes as an attribute for Line and Comment
deleted an old vote structure
added comment voting
dunno wahts going on
resolving a merge conflict
Merge pull request #6 from rubberyuzu/explore_conflict

Explore conflict