before merge with mazen
remove conflicts
Merge with mazen
cleaning up
clean up for merge
Merge commit 'eeef36fd55bcac74fa18975bd3eef03c553ba807'
Merge branch 'vec12'

Conflicts:
	Flens_supl/FLENSDataVector.cpp
	Flens_supl/gs_mpi_blas.cpp
	examples/main-parallel.cpp
	examples/main-serial.cpp
Merged but problem with GS
before merge
Merge remote-tracking branch 'mazen/master'

Conflicts:
	Fem/Mesh.hpp
	Flens_supl/FLENSDataVector.cpp
	Flens_supl/gs_mpi_blas.cpp
	examples/main-parallel.cpp
	examples/main-serial.cpp
Cleaned up some things and fixed getA()
pre-pull
Merge remote-tracking branch 'mazen/master'

Conflicts:
	Fem/Fem.cpp
	Fem/Fem.hpp
Cleaned up example cpp files
More cleaning - removed unrequired includes, fixed warnings in read_write_methods
Restoring 'Original' files to their actual original state. They seem to have been tampered with (oops)
..and a bit more
Add tex template
Added introduction
modified Makefiles