Pulling from develop
Fixed merge conflict
Added cardlib.h(dependency for server.cpp) and card/deck functionality to server