Some improvements
Merge branch 'master' of git@github.com:EnoahNetzach/fourFs.git

Conflicts:
	main.cpp
	matrix.cpp
	matrix.h
	pixel.h
	unit.cpp
	unit.h