update with may content
Merge branch 'master' of github.com:jsoxford/jsoxford.github.com