layout changes
Merge branch 'master' of https://github.com/donpironet/s3cr3t

Conflicts:
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/layout/fragment_main.xml