fix problems
delete .bak files
Merge branch 'master' of https://github.com/ThyberZee/cleandrathe