Win64 VC10 Pro
Windows 7 64
Merge branch 'master' of https://github.com/kvahed/codeare

Conflicts:
	src/matrix/OMP.hpp
	src/matrix/linalg/Lapack.hpp