test1
test2
Merge branch 'beta' of https://github.com/zlinoliver/PhotoAlbum into beta
add icon picture
add test3 comment