Merge branch 'BR80-RemergeGameCode'
Fixed n^2 ng-repeat bug
Fixed bug where time wasn't updating