Added info to encounter screen and added logic to fill out info. Joe needs to look at this when he does shields/weapons
Merge origin/master