changed main.py in lg2 branch
Merge branch 'lg2'

Conflicts:
	main.py