followed tut on socketo.me
Merge pull request #1 from QasAshraf/dev

followed tut on socketo.me, getting rid of dev branch