other comment
Merge branch 'master' of https://github.com/bcsthsc/Test-Project

Conflicts:
	src/class_d.py