commit of working status update, needs testing
Merge branch 'master' of https://github.com/kennethacohen/kennethacohen.github.com