fix merge conflict
start a small about section

clean cljsbuild