fixed doc
fixed -main
reverted web.clj
merged