hotfix
aaa
Merge branch 'temp'
Merge pull request #2 from yangong/feature/20130128_test

Feature/20130128 test
test
Merge branch 'master' of https://github.com/yangong/GitGarage into feature/20130128_test

Conflicts:
	Sample.txt