Upvotes broken
Merge branch 'master' of github.com:kellyjosephprice/ramblr

Conflicts:
	app/controllers/api/upvotes_controller.rb