Renamed and matched booleans isGameOver, isOgreAlive and isDragonAlive
Added player inventory in beginning var declarations, commented out alert when item is picked up
Made string quotations uniform and did more formatting
Merge remote-tracking branch 'refs/remotes/origin/patch-orig' into patch-orig

Conflicts:
	js/game.js

Merged work other workspace (forgot to publish from here), fixed escape slashes in strings