d
DBHalper
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/com/example/alpha/projecttest/QuestionActivity.java
	app/src/main/java/com/example/alpha/projecttest/TestList.java
Работает с базой