updated website
Merge branch 'master' of github.com:abajcsy/bilbo-swaggins