Setting up star Object
Merge commit 'HEAD@{1}'

Conflicts:
	main.py