add constant to SERVER
adjustments conflict
Merge pull request #20 from rayannrag/master

Add constant to SERVER and adjust conflicts