new and updated files
Merge branch 'master' of https://github.com/lhon058/thesis