Finished voting system
Fixed Merges