chou follow up
Merge branch 'master' of https://github.com/aneeshde/Research-Sharing

Conflicts:
	log/test.log
Merge branch 'master' of https://github.com/aneeshde/Research-Sharing

Conflicts:
	.gitignore
	app/controllers/faqs_controller.rb
Heroku
removed duplicate gem
try to fix heroku