stuff
test
Merge github.com:HyveMynd/cs3505-Final-Project

Conflicts:
	Server/server.o
Merge github.com:HyveMynd/cs3505-Final-Project
Merge github.com:HyveMynd/cs3505-Final-Project
added Makefile
Merge github.com:HyveMynd/cs3505-Final-Project