angular.module( 'moviematch', [
  'moviematch.auth',
  'moviematch.match',
  'moviematch.prefs',
  'moviematch.sessions',
  'moviematch.services',
  'moviematch.showmatch',
  'ngRoute'
  ])

.config( function ( $routeProvider ) {
  $routeProvider
    .when( '/signin', {
      templateUrl: 'app/auth/signin.html',
      controller: 'AuthController'
    })
    .when( '/signup', {
      templateUrl: 'app/auth/signup.html',
      controller: 'AuthController'
    })
    .when( '/match', {
      templateUrl: 'app/match/match.html',
      controller: 'MatchController'
    })
    .when( '/sessions', {
      templateUrl: 'app/sessions/joinsessions.html',
      controller: 'SessionsController'
    })
    .when( '/lobby', {
      templateUrl: 'app/sessions/sessionlobby.html',
      controller: 'SessionsController'
    .when( '/showmatch', {
      templateUrl: 'app/showmatch/showmatch.html',
      controller: 'ShowmatchController'
    })
    .when( '/showmatch', {
      templateUrl: 'app/showmatch/showmatch.html',
      controller: 'ShowmatchController'
    })
    .otherwise({
      redirectTo: '/signin'
    });
});

angular.module( 'moviematch', [
  'moviematch.auth',
  'moviematch.match',
  'moviematch.prefs',
  'moviematch.sessions',
  'moviematch.services',
  'moviematch.showmatch',
  'ngRoute'
  ])

.config( function ( $routeProvider ) {
  $routeProvider
    .when( '/signin', {
      templateUrl: 'app/auth/signin.html',
      controller: 'AuthController'
    })
    .when( '/signup', {
      templateUrl: 'app/auth/signup.html',
      controller: 'AuthController'
    })
    .when( '/match', {
      templateUrl: 'app/match/match.html',
      controller: 'MatchController'
    })
    .when( '/sessions', {
      templateUrl: 'app/sessions/joinsessions.html',
      controller: 'SessionsController'
    })
    .when( '/lobby', {
      templateUrl: 'app/sessions/sessionlobby.html',
      controller: 'SessionsController'
    .when( '/showmatch', {
      templateUrl: 'app/showmatch/showmatch.html',
      controller: 'ShowmatchController'
    })
    .when( '/showmatch', {
      templateUrl: 'app/showmatch/showmatch.html',
      controller: 'ShowmatchController'
    })
    .when( '/showmatch', {
      templateUrl: 'app/showmatch/showmatch.html',
      controller: 'ShowmatchController'
    })
    .otherwise({
      redirectTo: '/signin'
    });
});

solve merge conflict in app.js