Added hello.txt to master branch
resolved conflict in hello.txt
Added john.txt
Resolved conflict merge.txt
deleted some proprietary code
Merge branch 'master' of https://github.com/Lianik/pharm_message