renamed files, painting on reservations is working
Merge branch 'master' of github.com:sethhoward1988/lab-reservation-system
got reservation mechanism nearly working
resolved conflicts