Gamify Client and Server architecture changes
Merge pull request #31 from mauroa/master

Gamify Client and Server architecture changes