t
Merge branch 'master' of https://github.com/hankya/questions
Merge branch 'master' of https://github.com/hankya/questions

Conflicts:
	exampapers/questionmodels/models.pyc
	exampapers/spiders/cooco.pyc
	exampapers/spiders/jyeoo.pyc
Merge branch 'master' of https://github.com/hankya/questions
Merge branch 'master' of https://github.com/hankya/questions
Merge branch 'master' of https://github.com/hankya/questions
Merge branch 'master' of https://github.com/hankya/questions
Merge branch 'master' of https://github.com/hankya/questions
adding log file