fixed meerge conflicts

ionic-fb/www/build/0.js

@@ -1,14 +1,14 @@
 webpackJsonp([0],{
 
-/***/ 283:
+/***/ 288:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SignUpPageModule", function() { return SignUpPageModule; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TournamentsPageModule", function() { return TournamentsPageModule; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up__ = __webpack_require__(107);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tournaments__ = __webpack_require__(50);
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 
 
 
-var SignUpPageModule = /** @class */ (function () {
-    function SignUpPageModule() {
+var TournamentsPageModule = /** @class */ (function () {
+    function TournamentsPageModule() {
     }
-    SignUpPageModule = __decorate([
+    TournamentsPageModule = __decorate([
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
             declarations: [
-                __WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */],
+                __WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */],
             ],
             imports: [
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */]),
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */]),
             ],
         })
-    ], SignUpPageModule);
-    return SignUpPageModule;
+    ], TournamentsPageModule);
+    return TournamentsPageModule;
 }());
 
-//# sourceMappingURL=sign-up.module.js.map
+//# sourceMappingURL=tournaments.module.js.map
 
 /***/ })
 

ionic-fb/www/build/0.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pages/sign-up/sign-up.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACT;AAUvC;IAAA;IAA+B,CAAC;IAAnB,gBAAgB;QAR5B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,4DAAU;aACX;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,4DAAU,CAAC;aACrC;SACF,CAAC;OACW,gBAAgB,CAAG;IAAD,uBAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { SignUpPage } from './sign-up';\n\n@NgModule({\n  declarations: [\n    SignUpPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(SignUpPage),\n  ],\n})\nexport class SignUpPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/sign-up/sign-up.module.ts"],"sourceRoot":""}
+{"version":3,"sources":["../../src/pages/tournaments/tournaments.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACA;AAUhD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,qEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,qEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TournamentsPage } from './tournaments';\n\n@NgModule({\n  declarations: [\n    TournamentsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TournamentsPage),\n  ],\n})\nexport class TournamentsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/tournaments/tournaments.module.ts"],"sourceRoot":""}

ionic-fb/www/build/1.js

@@ -1,14 +1,14 @@
 webpackJsonp([1],{
 
-/***/ 288:
+/***/ 287:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TournamentsPageModule", function() { return TournamentsPageModule; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamsPageModule", function() { return TeamsPageModule; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tournaments__ = __webpack_require__(50);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__teams__ = __webpack_require__(103);
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 
 
 
-var TournamentsPageModule = /** @class */ (function () {
-    function TournamentsPageModule() {
+var TeamsPageModule = /** @class */ (function () {
+    function TeamsPageModule() {
     }
-    TournamentsPageModule = __decorate([
+    TeamsPageModule = __decorate([
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
             declarations: [
-                __WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */],
+                __WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */],
             ],
             imports: [
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */]),
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */]),
             ],
         })
-    ], TournamentsPageModule);
-    return TournamentsPageModule;
+    ], TeamsPageModule);
+    return TeamsPageModule;
 }());
 
-//# sourceMappingURL=tournaments.module.js.map
+//# sourceMappingURL=teams.module.js.map
 
 /***/ })
 

ionic-fb/www/build/1.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pages/tournaments/tournaments.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACA;AAUhD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,qEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,qEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"1.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TournamentsPage } from './tournaments';\n\n@NgModule({\n  declarations: [\n    TournamentsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TournamentsPage),\n  ],\n})\nexport class TournamentsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/tournaments/tournaments.module.ts"],"sourceRoot":""}
+{"version":3,"sources":["../../src/pages/teams/teams.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACZ;AAUpC;IAAA;IAA8B,CAAC;IAAlB,eAAe;QAR3B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,yDAAS;aACV;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,yDAAS,CAAC;aACpC;SACF,CAAC;OACW,eAAe,CAAG;IAAD,sBAAC;CAAA;AAAH","file":"1.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamsPage } from './teams';\n\n@NgModule({\n  declarations: [\n    TeamsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamsPage),\n  ],\n})\nexport class TeamsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/teams/teams.module.ts"],"sourceRoot":""}

ionic-fb/www/build/2.js

@@ -5,10 +5,10 @@ webpackJsonp([2],{
 
 "use strict";
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamDetailsPageModule", function() { return TeamDetailsPageModule; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamHomePageModule", function() { return TeamHomePageModule; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_details__ = __webpack_require__(105);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_home__ = __webpack_require__(104);
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 
 
 
-var TeamDetailsPageModule = /** @class */ (function () {
-    function TeamDetailsPageModule() {
+var TeamHomePageModule = /** @class */ (function () {
+    function TeamHomePageModule() {
     }
-    TeamDetailsPageModule = __decorate([
+    TeamHomePageModule = __decorate([
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
             declarations: [
-                __WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */],
+                __WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */],
             ],
             imports: [
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */]),
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */]),
             ],
         })
-    ], TeamDetailsPageModule);
-    return TeamDetailsPageModule;
+    ], TeamHomePageModule);
+    return TeamHomePageModule;
 }());
 
-//# sourceMappingURL=team-details.module.js.map
+//# sourceMappingURL=team-home.module.js.map
 
 /***/ })
 

ionic-fb/www/build/2.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pages/team-details/team-details.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACC;AAUjD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,sEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,sEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"2.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamDetailsPage } from './team-details';\n\n@NgModule({\n  declarations: [\n    TeamDetailsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamDetailsPage),\n  ],\n})\nexport class TeamDetailsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-details/team-details.module.ts"],"sourceRoot":""}
+{"version":3,"sources":["../../src/pages/team-home/team-home.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACL;AAU3C;IAAA;IAAiC,CAAC;IAArB,kBAAkB;QAR9B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,gEAAY;aACb;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,gEAAY,CAAC;aACvC;SACF,CAAC;OACW,kBAAkB,CAAG;IAAD,yBAAC;CAAA;AAAH","file":"2.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamHomePage } from './team-home';\n\n@NgModule({\n  declarations: [\n    TeamHomePage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamHomePage),\n  ],\n})\nexport class TeamHomePageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-home/team-home.module.ts"],"sourceRoot":""}

ionic-fb/www/build/3.js

@@ -1,14 +1,14 @@
 webpackJsonp([3],{
 
-/***/ 287:
+/***/ 285:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamsPageModule", function() { return TeamsPageModule; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamDetailsPageModule", function() { return TeamDetailsPageModule; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__teams__ = __webpack_require__(103);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_details__ = __webpack_require__(105);
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 
 
 
-var TeamsPageModule = /** @class */ (function () {
-    function TeamsPageModule() {
+var TeamDetailsPageModule = /** @class */ (function () {
+    function TeamDetailsPageModule() {
     }
-    TeamsPageModule = __decorate([
+    TeamDetailsPageModule = __decorate([
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
             declarations: [
-                __WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */],
+                __WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */],
             ],
             imports: [
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */]),
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */]),
             ],
         })
-    ], TeamsPageModule);
-    return TeamsPageModule;
+    ], TeamDetailsPageModule);
+    return TeamDetailsPageModule;
 }());
 
-//# sourceMappingURL=teams.module.js.map
+//# sourceMappingURL=team-details.module.js.map
 
 /***/ })
 

ionic-fb/www/build/3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pages/teams/teams.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACZ;AAUpC;IAAA;IAA8B,CAAC;IAAlB,eAAe;QAR3B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,yDAAS;aACV;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,yDAAS,CAAC;aACpC;SACF,CAAC;OACW,eAAe,CAAG;IAAD,sBAAC;CAAA;AAAH","file":"3.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamsPage } from './teams';\n\n@NgModule({\n  declarations: [\n    TeamsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamsPage),\n  ],\n})\nexport class TeamsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/teams/teams.module.ts"],"sourceRoot":""}
+{"version":3,"sources":["../../src/pages/team-details/team-details.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACC;AAUjD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,sEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,sEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"3.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamDetailsPage } from './team-details';\n\n@NgModule({\n  declarations: [\n    TeamDetailsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamDetailsPage),\n  ],\n})\nexport class TeamDetailsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-details/team-details.module.ts"],"sourceRoot":""}

ionic-fb/www/build/4.js

@@ -1,14 +1,14 @@
 webpackJsonp([4],{
 
-/***/ 285:
+/***/ 284:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamHomePageModule", function() { return TeamHomePageModule; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "StandingsPageModule", function() { return StandingsPageModule; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_home__ = __webpack_require__(104);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__standings__ = __webpack_require__(106);
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 
 
 
-var TeamHomePageModule = /** @class */ (function () {
-    function TeamHomePageModule() {
+var StandingsPageModule = /** @class */ (function () {
+    function StandingsPageModule() {
     }
-    TeamHomePageModule = __decorate([
+    StandingsPageModule = __decorate([
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
             declarations: [
-                __WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */],
+                __WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */],
             ],
             imports: [
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */]),
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */]),
             ],
         })
-    ], TeamHomePageModule);
-    return TeamHomePageModule;
+    ], StandingsPageModule);
+    return StandingsPageModule;
 }());
 
-//# sourceMappingURL=team-home.module.js.map
+//# sourceMappingURL=standings.module.js.map
 
 /***/ })
 

ionic-fb/www/build/4.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pages/team-home/team-home.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACL;AAU3C;IAAA;IAAiC,CAAC;IAArB,kBAAkB;QAR9B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,gEAAY;aACb;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,gEAAY,CAAC;aACvC;SACF,CAAC;OACW,kBAAkB,CAAG;IAAD,yBAAC;CAAA;AAAH","file":"4.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamHomePage } from './team-home';\n\n@NgModule({\n  declarations: [\n    TeamHomePage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamHomePage),\n  ],\n})\nexport class TeamHomePageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-home/team-home.module.ts"],"sourceRoot":""}
+{"version":3,"sources":["../../src/pages/standings/standings.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACJ;AAU5C;IAAA;IAAkC,CAAC;IAAtB,mBAAmB;QAR/B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,iEAAa;aACd;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,iEAAa,CAAC;aACxC;SACF,CAAC;OACW,mBAAmB,CAAG;IAAD,0BAAC;CAAA;AAAH","file":"4.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { StandingsPage } from './standings';\n\n@NgModule({\n  declarations: [\n    StandingsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(StandingsPage),\n  ],\n})\nexport class StandingsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/standings/standings.module.ts"],"sourceRoot":""}

ionic-fb/www/build/5.js

@@ -1,14 +1,14 @@
 webpackJsonp([5],{
 
-/***/ 284:
+/***/ 283:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "StandingsPageModule", function() { return StandingsPageModule; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SignUpPageModule", function() { return SignUpPageModule; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__standings__ = __webpack_require__(106);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up__ = __webpack_require__(107);
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 
 
 
-var StandingsPageModule = /** @class */ (function () {
-    function StandingsPageModule() {
+var SignUpPageModule = /** @class */ (function () {
+    function SignUpPageModule() {
     }
-    StandingsPageModule = __decorate([
+    SignUpPageModule = __decorate([
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
             declarations: [
-                __WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */],
+                __WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */],
             ],
             imports: [
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */]),
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */]),
             ],
         })
-    ], StandingsPageModule);
-    return StandingsPageModule;
+    ], SignUpPageModule);
+    return SignUpPageModule;
 }());
 
-//# sourceMappingURL=standings.module.js.map
+//# sourceMappingURL=sign-up.module.js.map
 
 /***/ })
 

ionic-fb/www/build/5.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pages/standings/standings.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACJ;AAU5C;IAAA;IAAkC,CAAC;IAAtB,mBAAmB;QAR/B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,iEAAa;aACd;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,iEAAa,CAAC;aACxC;SACF,CAAC;OACW,mBAAmB,CAAG;IAAD,0BAAC;CAAA;AAAH","file":"5.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { StandingsPage } from './standings';\n\n@NgModule({\n  declarations: [\n    StandingsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(StandingsPage),\n  ],\n})\nexport class StandingsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/standings/standings.module.ts"],"sourceRoot":""}
+{"version":3,"sources":["../../src/pages/sign-up/sign-up.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACT;AAUvC;IAAA;IAA+B,CAAC;IAAnB,gBAAgB;QAR5B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,4DAAU;aACX;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,4DAAU,CAAC;aACrC;SACF,CAAC;OACW,gBAAgB,CAAG;IAAD,uBAAC;CAAA;AAAH","file":"5.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { SignUpPage } from './sign-up';\n\n@NgModule({\n  declarations: [\n    SignUpPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(SignUpPage),\n  ],\n})\nexport class SignUpPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/sign-up/sign-up.module.ts"],"sourceRoot":""}

ionic-fb/www/build/main.js

@@ -347,27 +347,27 @@ var map = {
 	],
 	"../pages/sign-up/sign-up.module": [
 		283,
-		0
+		5
 	],
 	"../pages/standings/standings.module": [
 		284,
-		5
+		4
 	],
 	"../pages/team-details/team-details.module": [
-		286,
-		2
+		285,
+		3
 	],
 	"../pages/team-home/team-home.module": [
-		285,
-		4
+		286,
+		2
 	],
 	"../pages/teams/teams.module": [
 		287,
-		3
+		1
 	],
 	"../pages/tournaments/tournaments.module": [
 		288,
-		1
+		0
 	]
 };
 function webpackAsyncContext(req) {
@@ -515,8 +515,8 @@ var AppModule = /** @class */ (function () {
                         { loadChildren: '../pages/my-teams/my-teams.module#MyTeamsPageModule', name: 'MyTeamsPage', segment: 'my-teams', priority: 'low', defaultHistory: [] },
                         { loadChildren: '../pages/sign-up/sign-up.module#SignUpPageModule', name: 'SignUpPage', segment: 'sign-up', priority: 'low', defaultHistory: [] },
                         { loadChildren: '../pages/standings/standings.module#StandingsPageModule', name: 'StandingsPage', segment: 'standings', priority: 'low', defaultHistory: [] },
-                        { loadChildren: '../pages/team-home/team-home.module#TeamHomePageModule', name: 'TeamHomePage', segment: 'team-home', priority: 'low', defaultHistory: [] },
                         { loadChildren: '../pages/team-details/team-details.module#TeamDetailsPageModule', name: 'TeamDetailsPage', segment: 'team-details', priority: 'low', defaultHistory: [] },
+                        { loadChildren: '../pages/team-home/team-home.module#TeamHomePageModule', name: 'TeamHomePage', segment: 'team-home', priority: 'low', defaultHistory: [] },
                         { loadChildren: '../pages/teams/teams.module#TeamsPageModule', name: 'TeamsPage', segment: 'teams', priority: 'low', defaultHistory: [] },
                         { loadChildren: '../pages/tournaments/tournaments.module#TournamentsPageModule', name: 'TournamentsPage', segment: 'tournaments', priority: 'low', defaultHistory: [] }
                     ]
@@ -719,7 +719,7 @@ var ApiProvider = /** @class */ (function () {
         return this.http.get('http:localhost:8080/user');
     };
     ApiProvider.prototype.saveUser = function (createAccountInfo) {
-        return this.http.post("http://localhost:8080/user/add?name=" + createAccountInfo.name + "&password=" + createAccountInfo.password + "&email=" + createAccountInfo.email, {});
+        return this.http.post("http://localhost:8080/user/add?username=" + createAccountInfo.name + "&email=" + createAccountInfo.email + "&password=" + createAccountInfo.password, {});
     };
     ApiProvider = __decorate([
         Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["A" /* Injectable */])(),