Merge pull request #5 from penkar/master

Updating Bradley's repository with Jeffrey's work.
Added triggers and events to game logic and js_presenter.
Merge pull request #7 from bcaytonanderson/master

Updates to game logic and js_presenter