Server skeleton commit..
Merge https://github.com/theexar/Salal-berry-Team-Project