added files
Merge branch 'master' of https://github.com/anantoni/c_project_template

Conflicts:
	COPYING