Adds files to assets, writes tests
Merge branch 'master' of github.com:svblm/shipperd