Merge pull request #26 from onweapps/master

resolved merge conflict between group 1 and group 3 work
added voting buttons and changed rants#index to order rants by vote