2013-02-22 test GIT
2013-02-22 test GIT
Merge branch 'master' of https://github.com/cmpt440/Elevator.git
fix