Fixed e2e tests
Merge branch 'master' of github.com:mpwoz/carpool

* 'master' of github.com:mpwoz/carpool:
  Function comments
  Refactored controllers into separate files