Merge branch 'master' of https://github.com/brosplusplus/Minesweeper

Conflicts:
	manualGIT.txt
hola

Merge branch 'master' of https://github.com/brosplusplus/Minesweeper