new working conf
Merge branch 'master' of https://github.com/neemandu/project