Bug fixes, full class implementation, tested & verified
Merge remote-tracking branch 'origin/master'

Conflicts:
	cController.py
	cView.py