phil's addition
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/main.js