sync
Merge branch 'master' of https://github.com/CS-240-Group-Project-2/Star-Pusher

Conflicts:
	Star Pusher.depend
	src/Tiles/tiles.cpp