finished hello world
fixed merge conflicts
Merge branch 'firstbranch'
for travis