testing
Merge branch 'master' of https://github.com/zhzhang/GitWorkshop2013
Testing
merge test
tested merge
Some more notes on git.