trying to merge master
Merge branch 'master' of https://github.com/hamberguesa/stack_i_dont_know

Conflicts:
	stack_i_dont_know/spec/controllers/answers_controller_spec.rb