better summary
Merge branch 'master' of github.com:musketyr/musketyr.github.com