initial commit
B1 branch commit 1
Master branch commit 1
Merge branch 'b1'
updated readme
Merge branch 'b1'
Including README changes.
minor change, mainly to test head detaching
Merge branch 'master' of https://github.com/zhzhang/GitWorkshop2013
Testing
tested merge