adding link to local_settings
userena resole
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
preparing for pull
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
editing localsettings
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7
Merge branch 'master' of https://github.com/katarinakyh/cc7