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
Added enumeration for chart types
navbar merged
assets precompiled for heroku
Added ability to select chart types and integration tests for enums
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
Fixed the line chart issue and changed the formula for csv processing
Merge commit for chart types
Made adjustments to navbar
Modified counter
fixed specs
Merge branch 'logins'
Integrated linkedin login
Modified time