commiting changes
Merge branch 'master' of github.com:digdug0808/multiuser

Conflicts:
	homefile
updating my mother branch