changes
Merge branch 'master' of github.com:railskipl/meritize
js changes
Merge branch 'master' of github.com:railskipl/meritize