my commit.
Merge remote-tracking branch 'maemual/master'

Conflicts:
	Fish.MovieManager.Test/Program.cs
	Model/Fish.MovieManager.DoubanAPI/Class.cs
	Model/Fish.MovieManager.DoubanAPI/Fish.MovieManager.DoubanAPI.csproj
	MyModernMovieManager.sln
add a lot of files.
Merge remote-tracking branch 'maemual/master'

Conflicts:
	Fish.MovieManager.Test/Program.cs
	Model/Fish.MovieManager.DoubanAPI/Class.cs
	MyModernMovieManager.sln
Add a lot of modify.
Merge remote-tracking branch 'maemual/master'
hello~~~
Merge remote-tracking branch 'maemual/master'
hehe

Conflicts:
	Fish.MovieManager.Test/Program.cs
Merge remote-tracking branch 'maemual/master'
hehe

Conflicts:
	Control/Fish.MovieManager.ActorControl/Class1.cs
	Fish.MovieManager.Test/Program.cs
Merge remote-tracking branch 'maemual/master'
over~

Conflicts:
	Fish.MovieManager.Test/Program.cs
Merge pull request #1 from withwind93/master

my work is over.