added some unneeded stuff so I can pull
Merge branch 'master' of https://github.com/riktov/lsipod

Conflicts:
	Makefile
	config.h
	config.log
	config.status