Updated gitignore to include makefile for Linux
merge