first commit for jasmine/travis testing
Merge branch 'master' of github.com:james89/bus_app