Changes to db for Over,Under local setup
add solr data to gitignore
fix gitignore
changes to CSS and other files
edit gitignore for design
Merge Over,Under
Add sqlite3 to gemfile for convenience of designer
Merge from design
Fix database conflict