add database.yml to gitignore
Merge branch 'design'
dropdown
fix dropdown menu bug
Merge branch 'design'