random things
Merge branch 'master' of github.com:alexwilkinson/families
Merge branch 'master' of github.com:alexwilkinson/families
Merge branch 'master' of github.com:alexwilkinson/families
Merge branch 'master' of github.com:alexwilkinson/families
fixed one album feature spec