Add Makefile.ifort
Merge remote-tracking branch 'origin/master'

Conflicts:
	fortran/Makefile
	fortran/Makefile.gfortran
	fortran/Makefile.ifort