Merge pull request #163 from wibling/master

Add a library directory and content to showcase the lib layout.
ws tweaks
Merge pull request #164 from devoncarew/devoncarew_ws2

ws tweaks
Merge remote-tracking branch 'upstream/master'