merge conflict solved in the template  and .gitignore updated
merge conflict solved
Changed test
Merge branch 'master' of github.com:chartist/chartist
added omniauth
created the navbar
Added Facebook login
Fixed merge issues
created navbar
merge conflict in application.html.erb solved
Merge branch 'master' of github.com:chartist/chartist
Added enumeration for chart types
navbar merged
assets precompiled for heroku
Added ability to select chart types and integration tests for enums
added authentication for linkedin
added linkedin login
added login with fb, linkedin and google buttons on the sign in page
Merge branch 'signin-page'
Added bar and column charts. Line charts do not work for now