Added configs to .gitignore
resolved conflict with production version
Merge branch 'master' of https://github.com/codersclub/forum
Merge branch 'master' into devel