add function to pull CheerUps and User details along with either model. Add function to vote up and vote down a cheerup
Merge branch 'cheerup_index_show_functions' into development

Conflicts:
	log/development.log
	tmp/pids/server.pid