Removed basset to make life simpler
Merge branch 'master' of github.com:lsjroberts/gelatin-design