initial commit
more stuff
Merge branch 'master' of github.com:jeremy6d/shelf
merged in