Merge remote-tracking branch 'origin/master'

Conflicts:
	comlib.js
	cs4.js
	package.json
	public/Scripts/cs4Edit.js
	public/Scripts/cs4Home.js
	public/Scripts/cs4Settings.js
	public/Scripts/cs4Timing.js
	public/Scripts/cs4VerticalCanvas.js
	public/Scripts/data.js
	public/stylesheets/cs4Home.css
	public/stylesheets/cs4Info.css
	public/stylesheets/cs4Menu.css
	public/stylesheets/cs4Settings.css
	public/stylesheets/cs4Timing.css
	public/stylesheets/cs4VerticalCanvas.css
	routes/index.js
	views/CS4VerticalScroll.ejs
	views/cs4Help.ejs
	views/cs4Home.ejs
	views/cs4Info.ejs
	views/cs4Settings.ejs
	views/cs4Timing.ejs
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/Scripts/cs4Edit.js