[development test_travis] Removed space
[development test_travis] Resolved Conflict
Merge branch 'test_travis' of github.com:Qwinix/bournville-api into test_travis

Conflicts:
	README.rdoc