Names (bad quality but it's better than nothing)
Merge branch 'master' of https://github.com/MDamien/python-is-fun

Conflicts:
	vivelacom.py