added testall
added gitignore
merge
working on makefile