check if same project
working
non working
not working
xx
not working
bb
nnn
modified
Merge branch 'step2'

Conflicts:
	TypeScript Angular Phonecat.csproj.user
	angular phonecat typescript.csproj
	angular phonecat typescript.sln
	angular phonecat typescript.v12.suo
	js/_all.js.map
	js/_all.ts
updated git ignore
Merge branch 'step2'

Conflicts:
	.gitignore
	angular phonecat typescript.csproj
	app/index.html
	app/js/_all.ts
	app/js/app.js.map
	app/js/app.ts
	app/js/controllers.ts
	app/lib/angular/angular.d.ts
	app/lib/jquery/jquery.d.ts
	app/type_libs/angular/angular-cookies.d.ts
	app/type_libs/angular/angular-mocks.d.ts
	app/type_libs/angular/angular-resource.d.ts
	app/type_libs/angular/angular-sanitize.d.ts
	app/type_libs/angular/angular-scenario.d.ts
	app/type_libs/angular/angular.d.ts
	app/type_libs/jquery/jquery.d.ts
	js/libs/angular.d.ts
	js/libs/jquery.d.ts