simple update
Merge branch 'master' of https://github.com/sumginazu/dormsaver

Conflicts:
	answer.txt
	question.txt