updated code
Updated Code
updated code
Merge branch 'master' of https://github.com/Vizerai/CFA

Conflicts:
	cusp/detail/host/detail/csr_elementwise.h
	include/.fuse_hidden0000019f00000006
	include/.fuse_hidden000001b100000003
	include/CFA.h
	include/device_forms.inl
	include/host_forms.inl
	include/matrix_base.h
	include/matrix_types.h
	include/utils.h
	src/.fuse_hidden0000019e00000005
	src/CFA.cu
	src/CFA.o
	src/main.o
files were out of sync
Merge branch 'master' of https://github.com/Vizerai/CFA