unity

Signed-off-by: ninmonkeyx18 <eduards3@uci.edu>
Merge branch 'master' of https://github.com/brendonwai/Time-game

Conflicts:
	TimeGame/Assets/Sprites/Player/sprit sheet hack.png.meta

Signed-off-by: ninmonkeyx18 <eduards3@uci.edu>
Merge branch 'master' of https://github.com/brendonwai/Time-game