added a gridline wow this is annoying
bugs
rebuild pls
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html

merging from upstream