def
Merge branch 'master' of github.com:kjsung80/BayesianFiltering

Conflicts:
	TTPF.c