change tabs to 4 spaces
Merge pull request #11 from ErikFang/master

change tabs to 4 spaces
resolve confliction