bezier practically finished
Merge branch 'master' of https://github.com/jonatanfm/tfg

Conflicts:
	src/MainWindow.cpp