Updated the cmakelists
Merge branch 'master' of github.com:travisdesell/wildlife_at_home
Trying to get screensaver working
Merge branch 'master' of github.com:travisdesell/wildlife_at_home

Conflicts:
	client/wildlife_average.cpp
Merge branch 'master' of github.com:travisdesell/wildlife_at_home

Conflicts:
	client/wildlife_average.cpp