no changes to settings but added modules to gitignore
resolving merge conflicts
Merge branch 'development' of https://github.com/RCPL/RCPL-Drupal-7 into development
Merge branch 'development' of https://github.com/RCPL/RCPL-Drupal-7 into development
changes to settings file