tried to change the javascript settings in layouts
Merge remote-tracking branch 'origin/master'

Conflicts:
	CricketRegistrationApp/app/views/layouts/application.html.erb
Merge remote-tracking branch 'origin/master'

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