update
Merge branch 'master' of https://github.com/KevinZhao/Daoting

Conflicts:
	Daoting/Daoting/DataStructure/Album.m