10th chapter trouble
Merge branch 'master' of https://github.com/4eshircat/ember-trouble

# By Ruslan Yakhyaev
# Via Mikhail Gladchenko (1) and Ruslan Yakhyaev (1)
* 'master' of https://github.com/4eshircat/ember-trouble:
  Fixed problem with ember-data

Conflicts:
	index.html
	js/models/question_model.js