Thesis Project Committed 2

Server project included...