.gitignore is now working
adding Kris scene again
Added a FSM Playmaker to NPC_Trigger
Update .gitignore with new ignore list 

Ignore list from http://kleber-swf.com/the-definitive-gitignore-for-unity-projects/
Update .gitignore with new ignore list 

taken from http://kleber-swf.com/the-definitive-gitignore-for-unity-projects/
Srinivas Scene file
Testing changes in own scene
Added NPC movement and alter SaleManager SpawnPoints
adding Walter Scene file
fixing walter gitignore
Added new prefab Talk_npc
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop
photon networking libs added
gitignore conflict
Added a NPC Male A Prefab
Added Customer Dialogue to NPC Male A
added scripts to let NPC stop when a dialogue is occurring.
added NPC_Female_A prefab and added GUI_kris for future dialogue in Dunilog
change UI in dunilog and Deskmode
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop