Refactoring, added server
Merge branch 'master' of https://github.com/gcasar/rgti-2014