Added delay timer to server
Finished merge conflicts
Cleaned up couts and left justified timer
rebased to fix timer merge