master' of https://github.com/guyemerson/pyphon

Conflicts:
data/default_album.db
Second album