Merging
Merge branch 'master' of https://github.com/Studiosixer/CPE526Elevator
Change timer name