New branch
Small fix
Merge branch 'gui'

Conflicts:
	main.cpp