Makefile changes.
Merge branch 'master' of github.com:silicontrip/lavtools

Conflicts:
	Makefile