Font path issues
Merge branch 'ryan'
Removed slider code
Don't know what this is.
Merge branch 'ryan'
Merge branch 'master' of github.com:mugu87/myApp

Conflicts:
	app/views/welcome/index.html.erb
merge fix
fixed script conflicts.
add additional attributes to cause