sliding working
Merge branch 'master' of https://github.com/e-m-albright/OmniFlash

Conflicts:
	app/src/main/res/values/strings.xml