Linux Makefiles added

Added a Linux_Makefiles folder with the needed paths for linux.
Merge branch 'master' of https://github.com/Gabbeh/CHARM

Conflicts:
	.gitignore
	Virtual_Implementation/server/server
I think this should get the new files working