no changes
Merge branch 'master' of http://github.com/horngep/Shelf
working on changing nav bar background