add basic votable functionality
add rating and stats functions to CheerUps and User models
add with_votes scope to  CheerUps  model
merge from git hub
Merge branch 'cheerup_index_show_functions' into development

Conflicts:
	app/models/cheer_up.rb
	app/views/cheer_ups/index.html.erb
	log/development.log