added foo, added bar, added baz, removed foo
Merge branch 'cr-002' of https://github.com/goetzgrimm/psychic-sansa into cr-002