Added file
Merge branch 'master' of https://github.com/ThuF/repo.git into changes_branch_guest