Merge pull request #3 from christiansandtveit/master

Pull changes
Merge pull request #6 from christiansandtveit/Christian-Working-Branch

Christian working branch
Game Controls

Edited scripts to use xbox 360 controller for player movement. added a
vase to models
Merge pull request #9 from christiansandtveit/Christian-Working-Branch

Added moving spiders and a barrel object
update
update
Revert "update"

This reverts commit 7f551ffc425ca854209224d6a98aef13e512db3b.
Revert "Game Controls"

This reverts commit ba9ef1387ee00ce64f71feed7dc9c232567f601c.
Revert "update"

This reverts commit 44ce1bfeae66e71b75d3c4553783ce494532948b.
Merge pull request #10 from christiansandtveit/Darrin-Working-Branch

Darrin working branch
Game Controls 2

retry update
Revert "Game Controls 2"

This reverts commit d85209996d318d9e6d03a8bed63daf7ca492ad26.
Merge pull request #11 from christiansandtveit/master

pull changes
Game Controls 3

lets try this again
Merge pull request #12 from christiansandtveit/Darrin-Working-Branch

Darrin working branch
Intermediate 2