added return 0
fixed merge conflicts
Merge branch 'firstbranch'
testing for travis
make file and .gitignore
fixed makefile
fixed .travis.yml
Merge branch 'master' into firstbranch
testing with a bug