add I18n
remove empty file
Merge branch 'encoding'

Conflicts:
	app/controllers/answers_controller.rb
Merge pull request #53 from caok/master

Encoding:utf-8