Merge branch 'master' of https://github.com/aura-project/aura
Merge branch 'npcs'
Merge branch 'master' of https://github.com/aura-project/aura
Added Deian NPC.
Fixed small typo in deian.cs
Fixed a small error in deian resulting in stuck npc.
Another small typo fix for NPC deian.
Removed enter, Alphebatized phrases.
Added Caitin

Added Caitin to npcs, updated scripts.txt and Grocery_shops
Finalized Shop

Updated grocery shops to look similiar to live.
Merge branch 'npcs'
Fixed comment alignment

Some of the comments weren't aligned with the others
Fixed some spaces instead of tabs in deian.
More formatting in deian.cs
Blank line removal

Removing blank lines for format purposes
Merge branch 'npcs'
Merge pull request #35 from iAmazed/Caitin

Added Caitin to Npcs
Merge pull request #33 from epicmiro/npc_deian

Added NPC Deian
Made BattleStance a bool, closes #5
Fixed minor bug with prop xml