bb from cdmcmahon
Merge branch 'master' of https://github.com/cdmcmahon/cdmcmahon.github.com