improved some views and set up table for staff list
Updated conflicts
Fixed conflicts in users/index.html.erb
Deleted surgery_in_cal file. Both calendars in surgeries/index are now AJAX'd. Fixed button on user form.
AJAX is working properly. Individual details no longer show up multiple times
Reveal modal working using AJAX on surgeries index.