Include m4 directory
Added gitignore file
Merge branch 'master' of github.com:wedesoft/automake-tap

Conflicts:
	Makefile.am
	configure.ac