fixes migration
fixes migration
Merge branch 'master' of https://github.com/rsoto1/DPL-Student-Portal-Capstone
Changed Attendance icon
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
add devise registration routes scoped to staff
change redirect on ensure_staff! method
generate staff/users controller
move ensure_staff! method to application controller
Login landing page
moved login alert and made it white
Merge pull request #17 from alexand3rsc0tt/alert

LIA FTW
Merge branch 'master' into develop
Removed jquery-ui gem for rendering imporvements
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
add view for new locations
add view for edit locations