travis ci
Merge branch 'master' of github.com:gekken/sample_app

Conflicts:
	README.md