Merge pull request #9 from NicerHugs/master

fixes good guy display
Starts bad guy addition
Merge branch 'master' into sara-master

Conflicts:
	app/scripts/main.js
Adds bad guy
Merge pull request #10 from slkennedy/sara-master

Sara master