ok
make file update
Merge branch 'master' of github.com:antinucleon/cxxnet

Conflicts:
	Lcaffe.mk
	Makefile