Bell T2Tools
Bell
Bell
Bell
Merge branch 'bs_branch'

Conflicts:
	lib/cython/PQ_T2_tools/T2_tools_bell_LTSetups.pyd
	lib/cython/PQ_T2_tools/T2_tools_src/T2_tools_bell_LTSetups.c
	lib/cython/PQ_T2_tools/T2_tools_src/T2_tools_bell_LTSetups.pyd
	lib/cython/PQ_T2_tools/T2_tools_src/build/temp.win32-2.7/Release/T2_tools_bell_LTSetups.exp
	lib/cython/PQ_T2_tools/T2_tools_src/build/temp.win32-2.7/Release/T2_tools_bell_LTSetups.lib
	lib/cython/PQ_T2_tools/T2_tools_src/build/temp.win32-2.7/Release/T2_tools_bell_LTSetups.obj
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/params_lt3.py