minor updates
Merge branch 'master' of github.com:ctSkennerton/fxtract

Conflicts:
	main.cpp
add in the speed test