Middle add a function fun()
Middle add a function fun2()
Middle add a function fun3()
Merge branch 'middle'

Conflicts:
	Music/bin/classes/com/yuanwofei/music/MainActivity.class
Delect the function fun3()
Readd function fun3()
add a function fun4()
Secord add a class Secord
Secord add a class Secord2
Secord add a class Secord3
master add a function fun5()
Merge branch 'secord'
Rebase master and secord