fix makefile of demo
Merge branch 'master' of ssh://github.com/tqchen/mshadow

Conflicts:
	example/neuralnet/nnet.cu