added some more
Merge branch 'master' of github.com:BenjaminHerbert/stuff