add copyright header
add Makefile
modified
Merge branch 'trunk'

Conflicts:
	main.c