Update main.py
efwefewfw
Merge branch 'master' of https://github.com/fervarela28/Avalon

Conflicts:
	main.py
	main.pyc