aaa
Merge branch 'master' of https://github.com/ausir0726/alubm_demo.git

Conflicts:
	album/README.md