filter added
Merge branch 'master' of https://github.com/apikoka/sw_eng

Conflicts:
	DIP_Programming/DIP_Programming/DIP_ProgrammingMyClass.cpp