added some stuff
merged conflicts
added voting to recomemedo