testing git merge
Merge branch 'master' of https://github.com/slizer6/elevator

Checking if our works are easily put together