Counters
Merge remote-tracking branch 'origin/master'

Conflicts:
	graphwidget.cpp
	mainwindow.cpp
	mainwindow.h