updating branch
Merge branch 'master' of github.com:ColorTurtle/TimeBandit-Venture into jens-work
Merge pull request #8 from ColorTurtle/jens-work

Testing merge to master