finishing merge
Merge pull request #9 from Babakadam121/james_merge_babak_ui

James merge babak ui
fixed stuff for heroku
fixed some old merge conflict i missed
all the changes about splash page
created functionality to give shift
Fixed merge issues.
Merge branch 'master' of github.com:Babakadam121/shift_management_system into erwin_requests
working process
added more information about requests
Merge pull request #10 from Babakadam121/james_adding_more_info_for_request

James adding more info for request
left content column extra enhancing
made available requests show only if exsists
changes to available to shift
Merge branch 'master' of github.com:Babakadam121/shift_management_system into babak_ui_design
Merge pull request #11 from Babakadam121/babak_ui_design

Babak ui design
Request page is set up and all user is able to see all requests. Once an employee with requests is clicked 3 options show up from created, available and approved.
Fixed merge conflict.
Fixing merge issues once more.