Merge pull request #9 from clojurecup2014/clientside

Clientside
Merge branch 'master' into clientside