code
Merge branch 'master' of https://github.com/nathani/code_nathani

Conflicts:
	template_func.cpp