Trying to get cmake to compile
Merge branch 'master' of github.com:travisdesell/wildlife_at_home

Conflicts:
	client/CMakeLists.txt
Merge branch 'master' of github.com:travisdesell/wildlife_at_home
Updated installation and compilation instructions for OSX