Removed *.exe from git tree
Merged Makefiles