Merge branch 'master' into master

README.md

@@ -7,7 +7,7 @@
 [linux-image]: https://img.shields.io/travis/nestjs/nest/master.svg?label=linux
 [linux-url]: https://travis-ci.org/nestjs/nest
   
- <p align="center">A progressive <a href="http://nodejs.org" target="blank">Node.js</a> framework for building efficient and scalable web applications. </p>
+<p align="center">A progressive <a href="http://nodejs.org" target="blank">Node.js</a> framework for building efficient and scalable server-side applications. </p>
 <p align="center">
 <a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/v/@nestjs/cqrs.svg" alt="NPM Version" /></a>
 <a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>

index.js

@@ -1,5 +1,5 @@
 require('ts-node/register');
-require('./src/server');
+require('./src/main');
 
 
 

src/app.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 
 @Module({
-  modules: [],
+  imports: [],
   controllers: [AppController],
   components: [],
 })

src/main.ts

@@ -1,5 +1,5 @@
 import { NestFactory } from '@nestjs/core';
-import { ApplicationModule } from './modules/app.module';
+import { ApplicationModule } from './app.module';
 
 async function bootstrap() {
 	const app = await NestFactory.create(ApplicationModule);

tslint.json

@@ -12,6 +12,7 @@
             true,
             "single"
         ],
+        "indent": false,
         "member-access": [
             false
         ],