Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara

# Conflicts:
#	.gitignore

1 files changed, 26 insertions, 0 deletions

diff --git a/sandbox/test-projekat-danijel/frontend/src/app/app.module.ts b/sandbox/test-projekat-danijel/frontend/src/app/app.module.ts
new file mode 100644
index 00000000..7206649d
--- /dev/null
+++ b/sandbox/test-projekat-danijel/frontend/src/app/app.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+import { PageOneComponent } from './page-one/page-one.component';
+import { PageTwoComponent } from './page-two/page-two.component';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    PageOneComponent,
+    PageTwoComponent
+  ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule,
+    FormsModule,
+    HttpClientModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }