Holy shit it sort of works
Merge remote-tracking branch 'origin/master'

Conflicts:
	javascripts/hist.js