adding source

Conflicts:
	makefile