updated some stuff
Merge branch 'master' of https://github.com/alexhairyman/herrmanncode

pulling macbook work down