Initial commit
Adding server component
Merge branch 'origin/master'