commentariy
Repair

Conflicts:
	public/stylesheets/style.css
add works app.js