some questions features
Merge branch 'master' of https://github.com/KernelCorp/nostradamus
some questions features
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/questions/index.html.haml