update test
Merge branch 'master' of https://github.com/codejm/codejm.github.com