merge conflict solved in the template  and .gitignore updated
created the navbar
Fixed merge issues
created navbar
merge conflict in application.html.erb solved
Merge branch 'master' of github.com:chartist/chartist
navbar merged