bsm d3 server side
second merge
added new comments
added creds