made church.cps smaller
Merge branch 'master' of https://github.com/Vizerai/CFA
updated code
update
modified code
Merge branch 'master' of https://github.com/Vizerai/CFA

Conflicts:
	include/CFA.h
	include/device_forms.inl
	include/matrix_ops_device.h
	include/primitives.h
	include/scan.h
	src/CFA.cu