fix gitignore
Merge branch 'master' into test
added album styles