update readme
update travis
update travis
update travis
update travis
Merge branch 'master' of github.com:soygul/koan

Conflicts:
	README.md