Formatting changes
Merge branch 'master' of https://github.com/dasanchez/flipp

Conflicts:
	plotter/plotterwidget.h