mm
Merge branch 'master' of https://github.com/skmygdrs/linux

Conflicts:
	save/.bashrc
modify