travis integration
Merge branch 'master' of github.com:vltrrr/WebOhjRuby

Conflicts:
	README.rdoc