Added turbolinks track to styles and scripts...
Merge ../x0y0

Conflicts:
	app/views/layouts/application.html.erb