Merges changes that were on my machine to the feature-gameView branch