xterm settings
merge
added makefile