Merge branch 'master' of https://github.com/eldermyoshida/DevilElevator

Conflicts:
src/log.txt.1
deleted log