added config folder and environment.clj and development.clj
complete merge