my first commit
added main
added printf
added return 0
added closing curly bracket
fixed merge conflicts
setting up travis
Merge branch 'firstbranch'
testing for travis
added stuff
make file and .gitignore
fixed makefile
fixed .travis.yml
Merge branch 'master' into firstbranch
testing with a bug
hello.c
fixed merge