Fixed style
Merge branch 'feature' of github.com:DeKoyre/highfive

Conflicts:
	app/helpers/tasks_helper.rb