updated
Merge branch 'master' of https://github.com/trinker/trinker.github.com