killed ifs and elses when other constructs were more appropriate
Merge branch 'master' of https://github.com/OddLlama/js-vampire into OddLlama-master

OddLlama's changes :)

Conflicts:
	player.js