add somefile.txt
Merge branch 'master' of https://github.com/hoangtubatu/BadosaProject
add somefile.txt
remove somefile.txt
Merge branch 'master' into Hieu