auto
Merge branch 'master' of https://github.com/kila710/res-repo

Conflicts:
	fool_link/password