Merge pull request #2 from carharttjimmy/master

Merge pull request #1 from carharttjimmy/StagingArea
 Added iNPC and also added apache license boilerplate license to be in compliance
Merge branch 'StagingArea' of github.com:carharttjimmy/journeythroughalcadia into StagingArea
Merge pull request #3 from carharttjimmy/StagingArea

Staging area