first change
Merge xbranch with master
Merge branch 'master' of https://github.com/ray-chu/gpgpu-sim-new