Added some things
Merge branch 'master' of github.com:sean-kenny/slacker