Changed database.yml and Gemfile for localhost sqlite configuration
Error while nesting resources for new entries.  Not a roll back point!
nested entries resources
up to date with master: finished exposure accordion
reset gemlock file so hopefully a clean push
changes to git ignor