Added make file and gitignore
merge