fixes migration
fixes migration
Merge branch 'master' of https://github.com/rsoto1/DPL-Student-Portal-Capstone
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Student-Portal-Capstone
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Student-Portal-Capstone
Merge pull request #18 from cmckee-dev/develop

jquery ui gem

mergified
changes before I can pull
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Student-Portal-Capstone
Deleted names table
Breadcrumbs

- Created a breadcrumbs partial
- Need to create a helper to change the current path
- Need to change to .erb
- Added render partial tag to application
Dashboard

-	modified:   app/views/layouts/_breadcrumbs.html.erb
-	new file:   app/views/layouts/_search.html.erb
-	modified:   app/views/layouts/application.html.erb

- With breadcrumbs I changed links to .erb
- Still need to add breadcrumbs helper methods and implimentation
- Added a search bar under breadcrumbs, aligned right
- Need to add site search functionality (Talk to lia about postgres search features)
remove all references to names table
Merge pull request #24 from rsoto1/rocio/kill_names

Remove all migrations associated with names table
Dashboard

-	modified:   Gemfile
-	modified:   Gemfile.lock
-	modified:   app/assets/javascripts/application.js
-	modified:   app/assets/stylesheets/application.css.scss
-	modified:   app/assets/stylesheets/dashboard.css.scss
-	modified:   app/views/layouts/_search.html.erb
-	modified:   app/views/layouts/application.html.erb
-	modified:   app/views/staff/base/index.html.erb

- Added and styled search bar
- Added jquery-UI gem to file
- Added jquery-ui/sortable to JS and CSS files
- Took out turbolinks gemmfile
- took out turbolinks require for JS file
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone into merge

Conflicts:
	app/assets/javascripts/application.js
Removed Turbolinks from gemlock