Added voting functionality on answers
Merge branch 'master' of https://github.com/slowteetoe/stacks_on_stacks

Conflicts:
	app/views/questions/show.html.erb