Reorganized folders and added gtest library

Folders are now organized a little better. The gtest library is now
included in the lib folder, and the Makefile has been changed to reflect
the new project structure
Forgot to add modified files

Oops. In other news, coffee is awesome.
Merge branch 'master' of https://github.com/jcmcclurg/ECE428
Fixed some more Makefile compile issues

Self-explanatory.
Merge branch 'master' of https://github.com/jcmcclurg/ECE428

Conflicts:
	MP2/src/client/client.cpp