Merge pull request #1 from nwiede/master

Update main.cpp
Update LICENSE
Create .travis.yml
Create Makefile
Update Makefile
Merge pull request #1 from Lionel07/master

Pull changes