merge remote change
Merge branch 'source' of github.com:zjhiphop/zjhiphop.github.com into source