globals are null
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/cthulhu/ordabankiforandroid/Dictionary.java