started ex6.py
groove
Merge branch 'master' of github.com:azneita/hardway

Conflicts:
	ex6.py