All android studio files committed, maybe it will help to solve Bogdans exception
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/english/englishwords/app/MainActivity.java
	app/src/main/java/com/english/englishwords/app/NavigationDrawerFragment.java
	app/src/main/java/com/english/englishwords/app/excerciseproviders/DefinitionExerciseProvider.java
	app/src/main/java/com/english/englishwords/app/pojo/WordQueue.java
All android studio files committed, maybe it will help to solve Bogdans exception
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/english/englishwords/app/dao/WordDAO.java
	app/src/main/java/com/english/englishwords/app/excerciseproviders/DefinitionExerciseProvider.java
indentation is set to 2 spaces