library display and change library
merge conflict fix
Merge pull request #67 from fox-squirrels-2013/librarydisplay

library display and change library