SG2

Noria
Merge branch 'master' of https://github.com/Laurasmus/SG2

Conflicts:
	CMakeFiles/prueba.dir/CXX.includecache
	prueba.cpp