changed something
Merge branch 'master' of https://github.com/martinspeleo/graphgrid

Conflicts:
	graphs/templates/vitalsvis.html
merged branches