modified schedule.php, and timeclock and outer pages
merge from chad to sav
conflicts
merge conflict