Merge pull request #10 from slkennedy/sara-master

Sara master
moves showgoodguy and adds evil tests
Merge pull request #11 from NicerHugs/master

moves showgoodguy and adds evil tests
Adds bad guy display function