Prediction Controller Edits (work in progress)
Merge branch 'working' of https://github.com/dswright/ruby2 into working

Conflicts:
	app/helpers/comments_helper.rb