playing around with toolbar buttons
Merge branch 'master' into struct_changes

Conflicts:
	src/gui.c