Merge pull request #11 from NicerHugs/master

moves showgoodguy and adds evil tests
Adds bad guy display function
Updates character display template
Merge pull request #12 from slkennedy/sara-master

Adds bad guy display function