travis
Merge pull request #7 from freddiefujiwara/develop

travis