Modify hadoop practise1
modify shell_practise
111
resolve conflict1
fix conflict in practise1.iml