added user.clj again
merged