Update src/Makefile
Merge branch 'master' of https://github.com/yszheda/GPU-RSCode into alpha

Conflicts:
	src/Makefile
add CPU sequential code
reoragnize..