created house,room,quiz,quiz_quest, quiz_ques_answer migrations/models
Merge branch 'master' of github.com:davit-khaburdzania/fifth-dimension

Conflicts:
	db/schema.rb