edited for testing
Merge branch 'master' of https://github.com/brendonwai/Time-game

Conflicts:
	TimeGame/TGBuild_Data/output_log.txt
Merge branch 'master' of https://github.com/brendonwai/Time-game
Merge branch 'master' of https://github.com/brendonwai/Time-game

Conflicts:
	TimeGame/TGBuild_Data/output_log.txt
Merge branch 'master' of https://github.com/brendonwai/Time-game
Added in test file for map
Added in a test file for the map