Merge branch 'master' into clientside
Move public to resources
Merge pull request #7 from clojurecup2014/clientside

Clientside