[mgiglesias]

working perfectly fine.. there are some small bugs here and there that will be fixed once we are passed the "voting" stage. During this stage new commits can't be pushed, and server has to remain the same