Merge branch 'work_in_progress'
Merge branch 'work_in_progress'
Bugfix: Sometimes examining an item in the store, the description was intented wrong.

Signed-off-by: nppangband <nppangbanddev@verizon.net>
Merge git://github.com/levind/NPPAngband into bugfix

Conflicts:
	NPPchanges.txt
Merge branch 'bugfix' of github.com:levind/NPPAngband into bugfix