removed discuss
Merge branch 'movember' of github.com:jodaka/marlin into movember

Conflicts:
	js/script.js