Local changes to OSX app
Merge branch 'master' of github.com:travisdesell/wildlife_at_home

Conflicts:
	client/wildlife_surf.cpp
	undvc_common
	webpage/bootstrap_scripts.html
Updated to extract features based on differences in distance (not using
matching).
Added readme for simple test feature extraction
Working initial version, need to clean up common code.
Added a separate file for file_io
Fixed includes, uses file_io.hpp
Fixes to using file_io and includes
Added canvas files
Merge branch 'master' of github.com:travisdesell/wildlife_at_home

Conflicts:
	client/CMakeLists.txt
	client/compile_surf_osx.sh
	undvc_common
	webpage/bootstrap_scripts.html