kit
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/quodo.css
	public/css/quodo.map
	public/index.html