Ignoring the Makefile
Merge branch 'remove_makefile'

Conflicts:
	.gitignore