rebased files
Added travis file
Merge pull request #3 from CalvinFernandez/rebase-files

rebased files