code tidy
Merge branch 'master' of https://github.com/impossibro/WordTrain

Conflicts:
	bin/WordTrain.apk
	bin/classes.dex