Practicing with Git
Made changes to run in VS2013
My new feature branch changes
Added QA Log and output files
Merge branch 'master' of U:\Users\Cindy\OneDrive\Dev\My Web Sites\NodeMVA

# By DesertRambler (3) and Cindy (1)
* 'master' of U:\Users\Cindy\OneDrive\Dev\My Web Sites\NodeMVA:
  Added QA Log and output files
  My new feature branch changes
  Made changes to run in VS2013
  Practicing with Git

Conflicts (Resolved):
	01_HelloWorld/app.js
	09_NodeChatroom/09_NodeChatroom.njsproj