[development test_travis] Fixing error in Travis
[development test_travis] Fixing error in Travis
Merge branch 'test_travis' of github.com:Qwinix/bournville-api into test_travis

Conflicts:
	.travis.yml
Merge pull request #14 from Qwinix/test_travis

[development test_travis] Fixing error in Travis